diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-09-23 17:53:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 17:53:00 +0200 |
| commit | 12b1b12831d013709b1b3be7858b53e26d68328a (patch) | |
| tree | 9b7b7f112c777e502e99290f2476aedbab220028 /project/cmake | |
| parent | 4e35189c63b76c02eff4a1404f4a75db0df32e48 (diff) | |
| parent | d0e217a19d4b86de067e76ceeeedd225940a7f1a (diff) | |
Merge pull request #10482 from fetzerch/cmake_lirc
[cmake] Fix LIRC_DEVICE option
Diffstat (limited to 'project/cmake')
| -rw-r--r-- | project/cmake/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | project/cmake/scripts/freebsd/ArchSetup.cmake | 3 | ||||
| -rw-r--r-- | project/cmake/scripts/linux/ArchSetup.cmake | 5 | ||||
| -rw-r--r-- | 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") |