frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to cmake 2.8.12 (#451)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/hyperion-aml/CMakeLists.txt
View File

@@ -1,19 +1,15 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
project(hyperion-aml)
find_package(Qt5Widgets REQUIRED)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
${QT_INCLUDES}
${PROTOBUF_INCLUDE_DIRS}
)
set(Hyperion_AML_QT_HEADERS
AmlogicWrapper.h
)
set(Hyperion_AML_HEADERS
AmlogicWrapper.h
)
set(Hyperion_AML_SOURCES
@@ -21,12 +17,9 @@ set(Hyperion_AML_SOURCES
AmlogicWrapper.cpp
)
QT5_WRAP_CPP(Hyperion_AML_HEADERS_MOC ${Hyperion_AML_QT_HEADERS})
add_executable(${PROJECT_NAME}
${Hyperion_AML_HEADERS}
${Hyperion_AML_SOURCES}
${Hyperion_AML_HEADERS_MOC}
)
target_link_libraries(${PROJECT_NAME}
@@ -37,10 +30,11 @@ target_link_libraries(${PROJECT_NAME}
protoserver
amlogic-grabber
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)

15
src/hyperion-dispmanx/CMakeLists.txt
View File

@@ -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)

16
src/hyperion-framebuffer/CMakeLists.txt
View File

@@ -1,19 +1,15 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
project(hyperion-framebuffer)
find_package(Qt5Widgets REQUIRED)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
${QT_INCLUDES}
${PROTOBUF_INCLUDE_DIRS}
)
set(Hyperion_FB_QT_HEADERS
FramebufferWrapper.h
)
set(Hyperion_FB_HEADERS
FramebufferWrapper.h
)
set(Hyperion_FB_SOURCES
@@ -21,12 +17,9 @@ set(Hyperion_FB_SOURCES
FramebufferWrapper.cpp
)
QT5_WRAP_CPP(Hyperion_FB_HEADERS_MOC ${Hyperion_FB_QT_HEADERS})
add_executable( ${PROJECT_NAME}
${Hyperion_FB_HEADERS}
${Hyperion_FB_SOURCES}
${Hyperion_FB_HEADERS_MOC}
)
target_link_libraries( ${PROJECT_NAME}
@@ -37,10 +30,11 @@ target_link_libraries( ${PROJECT_NAME}
protoserver
framebuffer-grabber
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)

16
src/hyperion-osx/CMakeLists.txt
View File

@@ -1,19 +1,15 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
project(hyperion-osx)
find_package(Qt5Widgets REQUIRED)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
${QT_INCLUDES}
${PROTOBUF_INCLUDE_DIRS}
)
set(Hyperion_OSX_QT_HEADERS
OsxWrapper.h
)
set(Hyperion_OSX_HEADERS
OsxWrapper.h
)
set(Hyperion_OSX_SOURCES
@@ -21,12 +17,9 @@ set(Hyperion_OSX_SOURCES
OsxWrapper.cpp
)
QT5_WRAP_CPP(Hyperion_OSX_HEADERS_MOC ${Hyperion_OSX_QT_HEADERS})
add_executable( ${PROJECT_NAME}
${Hyperion_OSX_HEADERS}
${Hyperion_OSX_SOURCES}
${Hyperion_OSX_HEADERS_MOC}
)
target_link_libraries( ${PROJECT_NAME}
@@ -37,10 +30,11 @@ target_link_libraries( ${PROJECT_NAME}
protoserver
osx-grabber
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)

12
src/hyperion-remote/CMakeLists.txt
View File

@@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
project(hyperion-remote)
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
# set(CMAKE_CXX_FLAGS "-fPIC")
# The following I do not undrstand completely...
# libQtCore.so uses some hardcoded library path inside which are incorrect after copying the file RPi file system
@@ -12,8 +10,6 @@ IF ( EXISTS ${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf )
LINK_DIRECTORIES(${LINK_DIRECTORIES} ${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)
ENDIF()
include_directories(${QT_INCLUDES})
set(hyperion-remote_HEADERS
JsonConnection.h)
@@ -28,9 +24,9 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
effectengine
commandline
${QT_LIBRARIES})
qt5_use_modules(${PROJECT_NAME} Gui Core Network)
Qt5::Gui
Qt5::Core
Qt5::Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )

19
src/hyperion-v4l2/CMakeLists.txt
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)

15
src/hyperion-x11/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
project(hyperion-x11)
find_package(Qt5Widgets REQUIRED)
@@ -6,15 +6,12 @@ find_package(X11 REQUIRED)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
${QT_INCLUDES}
${X11_INCLUDES}
${PROTOBUF_INCLUDE_DIRS}
)
set(Hyperion_X11_QT_HEADERS
X11Wrapper.h)
set(Hyperion_X11_HEADERS
X11Wrapper.h
)
set(Hyperion_X11_SOURCES
@@ -22,12 +19,9 @@ set(Hyperion_X11_SOURCES
X11Wrapper.cpp
)
QT5_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS})
add_executable(${PROJECT_NAME}
${Hyperion_X11_HEADERS}
${Hyperion_X11_SOURCES}
${Hyperion_X11_HEADERS_MOC}
)
target_link_libraries(${PROJECT_NAME}
@@ -40,10 +34,11 @@ target_link_libraries(${PROJECT_NAME}
${X11_LIBRARIES}
${X11_Xrender_LIB}
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)

10
src/hyperiond/CMakeLists.txt
View File

@@ -1,13 +1,6 @@
SET(Hyperiond_QT_HEADERS
add_executable(hyperiond
hyperiond.h
)
QT5_WRAP_CPP(Hyperiond_HEADERS_MOC ${Hyperiond_QT_HEADERS})
add_executable(hyperiond
${Hyperiond_QT_HEADERS}
${Hyperiond_HEADERS_MOC}
hyperiond.cpp
main.cpp
)
@@ -58,4 +51,3 @@ if(CMAKE_HOST_UNIX)
install(FILES ${CMAKE_BINARY_DIR}/symlink_hyperiond DESTINATION "bin" RENAME hyperiond COMPONENT "${PLATFORM}" )
install(CODE "FILE (REMOVE ${CMAKE_BINARY_DIR}/symlink_hyperiond )" COMPONENT "${PLATFORM}" )
endif(CMAKE_HOST_UNIX)