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:
brindosch
2017-08-01 15:42:36 +02:00
committed by GitHub
parent 8752a313bc
commit 5c7085439b
57 changed files with 161 additions and 4153 deletions

View File

@@ -1,20 +1,15 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
project(hyperion-v4l2)
find_package(Qt5Widgets REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
${PROTOBUF_INCLUDE_DIRS}
${QT_INCLUDES}
)
set(Hyperion_V4L2_QT_HEADERS
ScreenshotHandler.h
)
set(Hyperion_V4L2_HEADERS
ScreenshotHandler.h
)
set(Hyperion_V4L2_SOURCES
@@ -22,13 +17,9 @@ set(Hyperion_V4L2_SOURCES
ScreenshotHandler.cpp
)
QT5_WRAP_CPP(Hyperion_V4L2_MOC_SOURCES ${Hyperion_V4L2_QT_HEADERS})
add_executable(${PROJECT_NAME}
${Hyperion_V4L2_HEADERS}
${Hyperion_V4L2_SOURCES}
${Hyperion_V4L2_QT_HEADERS}
${Hyperion_V4L2_MOC_SOURCES}
)
target_link_libraries(${PROJECT_NAME}
@@ -39,11 +30,11 @@ target_link_libraries(${PROJECT_NAME}
hyperion-utils
protoserver
pthread
${QT_LIBRARIES}
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)