From d0e217a19d4b86de067e76ceeeedd225940a7f1a Mon Sep 17 00:00:00 2001
From: Christian Fetzer <fetzer.ch@gmail.com>
Date: Sat, 17 Sep 2016 16:49:40 +0200
Subject: [cmake] Fix LIRC_DEVICE option

Consolidate the LIRC_DEVICE option in main CMakeLists.txt to avoid
code duplication.

Fix handling of quotes in that option. Currently if a user wants to
set LIRC_DEVICE, escaped quotes have to be used. This is inconvenient
and has been reported as bug: http://trac.kodi.tv/ticket/16860.
---
 project/cmake/CMakeLists.txt                  | 5 +++++
 project/cmake/scripts/freebsd/ArchSetup.cmake | 3 ---
 project/cmake/scripts/linux/ArchSetup.cmake   | 5 -----
 project/cmake/scripts/rbpi/ArchSetup.cmake    | 2 --
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
index ab7a2f548d..76870a45d8 100644
--- a/project/cmake/CMakeLists.txt
+++ b/project/cmake/CMakeLists.txt
@@ -178,6 +178,11 @@ if(ENABLE_OPTICAL)
   core_require_dep(Cdio)
 endif()
 
+if(ENABLE_LIRC)
+  set(LIRC_DEVICE /dev/lircd CACHE STRING "LIRC device to use")
+  list(APPEND DEP_DEFINES -DLIRC_DEVICE="${LIRC_DEVICE}" -DHAVE_LIRC=1)
+endif()
+
 if(ENABLE_AIRTUNES)
   find_package(Shairplay)
   if(SHAIRPLAY_FOUND)
diff --git a/project/cmake/scripts/freebsd/ArchSetup.cmake b/project/cmake/scripts/freebsd/ArchSetup.cmake
index b85121f5d7..013205c6a0 100644
--- a/project/cmake/scripts/freebsd/ArchSetup.cmake
+++ b/project/cmake/scripts/freebsd/ArchSetup.cmake
@@ -14,6 +14,3 @@ else()
     message(WARNING "unknown CPU: ${CPU}")
   endif()
 endif()
-
-set(LIRC_DEVICE "\"/dev/lircd\"" CACHE STRING "LIRC device to use")
-set(DEP_DEFINES -DLIRC_DEVICE=${LIRC_DEVICE})
diff --git a/project/cmake/scripts/linux/ArchSetup.cmake b/project/cmake/scripts/linux/ArchSetup.cmake
index 3cf5562d8c..be99c5b7a0 100644
--- a/project/cmake/scripts/linux/ArchSetup.cmake
+++ b/project/cmake/scripts/linux/ArchSetup.cmake
@@ -27,11 +27,6 @@ endif()
 find_package(CXX11 REQUIRED)
 include(LDGOLD)
 
-if(ENABLE_LIRC)
-  set(LIRC_DEVICE "\"/dev/lircd\"" CACHE STRING "LIRC device to use")
-  set(DEP_DEFINES -DLIRC_DEVICE=${LIRC_DEVICE} -DHAVE_LIRC=1)
-endif()
-
 # Code Coverage
 if(CMAKE_BUILD_TYPE STREQUAL Coverage)
   set(COVERAGE_TEST_BINARY ${APP_NAME_LC}-test)
diff --git a/project/cmake/scripts/rbpi/ArchSetup.cmake b/project/cmake/scripts/rbpi/ArchSetup.cmake
index 93ac01d073..fa1f9f4cce 100644
--- a/project/cmake/scripts/rbpi/ArchSetup.cmake
+++ b/project/cmake/scripts/rbpi/ArchSetup.cmake
@@ -23,8 +23,6 @@ endif()
 
 find_package(CXX11 REQUIRED)
 
-set(LIRC_DEVICE "\"/dev/lircd\"" CACHE STRING "LIRC device to use")
-set(DEP_DEFINES -DLIRC_DEVICE=${LIRC_DEVICE})
 set(MMAL_FOUND 1 CACHE INTERNAL "MMAL")
 set(OMX_FOUND 1 CACHE INTERNAL "OMX")
 set(OMXLIB_FOUND 1 CACHE INTERNAL "OMX")
-- 
cgit v1.2.3