mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
update to cmake 2.8.12 (#451)
* update * resolve qt5w * test * Go down cmake python search won the price for crazy lib searches! * 2.7 python forced, RPATH * upstream * ... * update * ... * 2.7.12 py it picks random versions... * max 7.12.5.... * Test 14.04 tests
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 2.8)
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
project(hyperion-dispmanx)
|
||||
|
||||
find_package(Qt5Widgets REQUIRED)
|
||||
@@ -6,15 +6,12 @@ find_package(BCM REQUIRED)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
|
||||
${QT_INCLUDES}
|
||||
${BCM_INCLUDE_DIRS}
|
||||
${PROTOBUF_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set(Hyperion_Dispmanx_QT_HEADERS
|
||||
DispmanxWrapper.h)
|
||||
|
||||
set(Hyperion_Dispmanx_HEADERS
|
||||
DispmanxWrapper.h
|
||||
)
|
||||
|
||||
set(Hyperion_Dispmanx_SOURCES
|
||||
@@ -22,12 +19,9 @@ set(Hyperion_Dispmanx_SOURCES
|
||||
DispmanxWrapper.cpp
|
||||
)
|
||||
|
||||
QT5_WRAP_CPP(Hyperion_Dispmanx_HEADERS_MOC ${Hyperion_Dispmanx_QT_HEADERS})
|
||||
|
||||
add_executable( ${PROJECT_NAME}
|
||||
${Hyperion_Dispmanx_HEADERS}
|
||||
${Hyperion_Dispmanx_SOURCES}
|
||||
${Hyperion_Dispmanx_HEADERS_MOC}
|
||||
)
|
||||
|
||||
target_link_libraries( ${PROJECT_NAME}
|
||||
@@ -39,10 +33,11 @@ target_link_libraries( ${PROJECT_NAME}
|
||||
dispmanx-grabber
|
||||
${Dispmanx_LIBRARIES}
|
||||
pthread
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Network
|
||||
)
|
||||
|
||||
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
|
||||
|
||||
install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
|
||||
|
||||
if(CMAKE_HOST_UNIX)
|
||||
|
Reference in New Issue
Block a user