Fix CEC compilation

This commit is contained in:
Iwan Timmer 2016-02-19 21:51:13 +01:00
parent 1e010757fc
commit 8a8ab6348d

View File

@ -17,7 +17,6 @@ find_package(ALSA REQUIRED)
find_package(Opus REQUIRED) find_package(Opus REQUIRED)
find_package(Broadcom) find_package(Broadcom)
find_package(Freescale) find_package(Freescale)
find_package(CEC 3.0)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(EVDEV REQUIRED libevdev) pkg_check_modules(EVDEV REQUIRED libevdev)
@ -28,6 +27,7 @@ pkg_check_modules(AVUTIL libavutil)
pkg_check_modules(XLIB x11-xcb) pkg_check_modules(XLIB x11-xcb)
pkg_check_modules(LIBVA vdpau) pkg_check_modules(LIBVA vdpau)
pkg_check_modules(PULSE libpulse-simple) pkg_check_modules(PULSE libpulse-simple)
pkg_check_modules(CEC libcec>=3.0.0)
if(AVCODEC_FOUND AND AVUTIL_FOUND AND SDL_FOUND) if(AVCODEC_FOUND AND AVUTIL_FOUND AND SDL_FOUND)
set(SOFTWARE_FOUND TRUE) set(SOFTWARE_FOUND TRUE)
@ -73,8 +73,6 @@ if (PULSE_FOUND)
list(APPEND MOONLIGHT_OPTIONS PULSE) list(APPEND MOONLIGHT_OPTIONS PULSE)
endif() endif()
configure_file("./src/configuration.h.in" "${PROJECT_BINARY_DIR}/configuration.h")
include_directories("${PROJECT_BINARY_DIR}") include_directories("${PROJECT_BINARY_DIR}")
list(APPEND SRC_LIST ./src/audio/alsa.c) list(APPEND SRC_LIST ./src/audio/alsa.c)
@ -85,10 +83,10 @@ add_executable(moonlight ${SRC_LIST})
target_link_libraries(moonlight gamestream) target_link_libraries(moonlight gamestream)
set_property(TARGET moonlight PROPERTY C_STANDARD 99) set_property(TARGET moonlight PROPERTY C_STANDARD 99)
if (CEC_FOUND AND CEC_VERSION_COMPATIBLE) if (CEC_FOUND)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC) list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC)
list(APPEND MOONLIGHT_OPTIONS CEC) list(APPEND MOONLIGHT_OPTIONS CEC)
target_include_directories(moonlight PRIVATE ./third_party/libcec ${CEC_INCLUDE_DIRS}/libcec) target_include_directories(moonlight PRIVATE ./third_party/libcec ${CEC_INCLUDE_DIRS})
target_link_libraries(moonlight ${CEC_LIBRARIES}) target_link_libraries(moonlight ${CEC_LIBRARIES})
endif() endif()
@ -126,6 +124,8 @@ if (PULSE_FOUND)
target_link_libraries(moonlight ${PULSE_LIBRARIES}) target_link_libraries(moonlight ${PULSE_LIBRARIES})
endif() endif()
configure_file("./src/configuration.h.in" "${PROJECT_BINARY_DIR}/configuration.h")
set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS}) set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS})
target_include_directories(moonlight PRIVATE ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS}) target_include_directories(moonlight PRIVATE ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS})
target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS}) target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS})