frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

make shared libs work again (#239)

This commit is contained in:
redPanther 2016-09-13 17:39:01 +02:00 committed by GitHub
parent 52283b3257
commit ccc50899fb
9 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/hyperion/CMakeLists.txt
View File

@ -58,10 +58,8 @@ add_library(hyperion
) )
target_link_libraries(hyperion target_link_libraries(hyperion
kodivideochecker
blackborder blackborder
hyperion-utils hyperion-utils
leddevice leddevice
effectengine
${QT_LIBRARIES} ${QT_LIBRARIES}
) )

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

@ -30,7 +30,8 @@ add_executable(${PROJECT_NAME}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
commandline effectengine
commandline
blackborder blackborder
hyperion-utils hyperion-utils
protoserver protoserver

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

@ -31,7 +31,8 @@ add_executable( ${PROJECT_NAME}
) )
target_link_libraries( ${PROJECT_NAME} target_link_libraries( ${PROJECT_NAME}
commandline effectengine
commandline
blackborder blackborder
hyperion-utils hyperion-utils
protoserver protoserver

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

@ -30,7 +30,8 @@ add_executable( ${PROJECT_NAME}
) )
target_link_libraries( ${PROJECT_NAME} target_link_libraries( ${PROJECT_NAME}
commandline effectengine
commandline
blackborder blackborder
hyperion-utils hyperion-utils
protoserver protoserver

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

@ -30,7 +30,8 @@ add_executable( ${PROJECT_NAME}
) )
target_link_libraries( ${PROJECT_NAME} target_link_libraries( ${PROJECT_NAME}
commandline effectengine
commandline
blackborder blackborder
hyperion-utils hyperion-utils
protoserver protoserver

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

@ -26,7 +26,8 @@ add_executable(${PROJECT_NAME}
${hyperion-remote_SOURCES}) ${hyperion-remote_SOURCES})
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
commandline effectengine
commandline
jsoncpp jsoncpp
${QT_LIBRARIES}) ${QT_LIBRARIES})

3
src/hyperion-v4l2/CMakeLists.txt
View File

@ -32,8 +32,9 @@ add_executable(${PROJECT_NAME}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
effectengine
v4l2-grabber v4l2-grabber
commandline commandline
blackborder blackborder
hyperion-utils hyperion-utils
protoserver protoserver

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

@ -31,6 +31,7 @@ add_executable(${PROJECT_NAME}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
effectengine
blackborder blackborder
commandline commandline
hyperion-utils hyperion-utils

22
test/CMakeLists.txt
View File

@ -4,7 +4,7 @@ include_directories(../libsrc)
if(ENABLE_SPIDEV) if(ENABLE_SPIDEV)
# Add the simple test executable 'TestSpi' # Add the simple test executable 'TestSpi'
add_executable(test_spi TestSpi.cpp) add_executable(test_spi TestSpi.cpp)
target_link_libraries(test_spi hyperion) target_link_libraries(test_spi hyperion effectengine)
add_executable(spidev_test spidev_test.c) add_executable(spidev_test spidev_test.c)
@ -14,7 +14,9 @@ endif(ENABLE_SPIDEV)
add_executable(test_configfile add_executable(test_configfile
TestConfigFile.cpp) TestConfigFile.cpp)
target_link_libraries(test_configfile target_link_libraries(test_configfile
hyperion) hyperion
effectengine
)
add_executable(test_ImageRgb add_executable(test_ImageRgb
TestRgbImage.cpp) TestRgbImage.cpp)
@ -24,24 +26,32 @@ target_link_libraries(test_ImageRgb
add_executable(test_colortransform add_executable(test_colortransform
TestColorTransform.cpp) TestColorTransform.cpp)
target_link_libraries(test_colortransform target_link_libraries(test_colortransform
hyperion) hyperion
effectengine
)
add_executable(test_image2ledsmap add_executable(test_image2ledsmap
TestImage2LedsMap.cpp) TestImage2LedsMap.cpp)
target_link_libraries(test_image2ledsmap target_link_libraries(test_image2ledsmap
hyperion) hyperion
effectengine
)
if (ENABLE_DISPMANX) if (ENABLE_DISPMANX)
add_subdirectory(dispmanx2png) add_subdirectory(dispmanx2png)
endif (ENABLE_DISPMANX) endif (ENABLE_DISPMANX)
add_executable(test_blackborderdetector TestBlackBorderDetector.cpp) add_executable(test_blackborderdetector TestBlackBorderDetector.cpp)
target_link_libraries(test_blackborderdetector hyperion) target_link_libraries(test_blackborderdetector
effectengine
hyperion)
add_executable(test_blackborderprocessor add_executable(test_blackborderprocessor
TestBlackBorderProcessor.cpp) TestBlackBorderProcessor.cpp)
target_link_libraries(test_blackborderprocessor target_link_libraries(test_blackborderprocessor
hyperion) hyperion
effectengine
)
add_executable(test_qregexp TestQRegExp.cpp) add_executable(test_qregexp TestQRegExp.cpp)
target_link_libraries(test_qregexp target_link_libraries(test_qregexp