mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
Removed use of qt4_use_modules from build files
Former-commit-id: 49860cd93e1492a2c67bd2a84bd082713a0c8e9b
This commit is contained in:
parent
7a51c3e4ac
commit
c5b18d5925
@ -8,9 +8,9 @@ cmake_minimum_required(VERSION 2.8)
|
|||||||
|
|
||||||
# set the build options
|
# set the build options
|
||||||
option(ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ON)
|
option(ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ON)
|
||||||
option (ENABLE_SPIDEV "Enable the SPIDEV device" ON)
|
|
||||||
|
|
||||||
message(STATUS "ENABLE_DISPMANX = " ${ENABLE_DISPMANX})
|
message(STATUS "ENABLE_DISPMANX = " ${ENABLE_DISPMANX})
|
||||||
|
|
||||||
|
option(ENABLE_SPIDEV "Enable the SPIDEV device" ON)
|
||||||
message(STATUS "ENABLE_SPIDEV = " ${ENABLE_SPIDEV})
|
message(STATUS "ENABLE_SPIDEV = " ${ENABLE_SPIDEV})
|
||||||
|
|
||||||
option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
|
option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
|
||||||
|
@ -28,9 +28,5 @@ add_library(boblightserver
|
|||||||
|
|
||||||
target_link_libraries(boblightserver
|
target_link_libraries(boblightserver
|
||||||
hyperion
|
hyperion
|
||||||
hyperion-utils)
|
hyperion-utils
|
||||||
|
${QT_LIBRARIES})
|
||||||
qt4_use_modules(boblightserver
|
|
||||||
Core
|
|
||||||
Gui
|
|
||||||
Network)
|
|
||||||
|
@ -37,9 +37,5 @@ add_library(jsonserver
|
|||||||
target_link_libraries(jsonserver
|
target_link_libraries(jsonserver
|
||||||
hyperion
|
hyperion
|
||||||
hyperion-utils
|
hyperion-utils
|
||||||
jsoncpp)
|
jsoncpp
|
||||||
|
${QT_LIBRARIES})
|
||||||
qt4_use_modules(jsonserver
|
|
||||||
Core
|
|
||||||
Gui
|
|
||||||
Network)
|
|
||||||
|
@ -44,9 +44,5 @@ add_library(protoserver
|
|||||||
target_link_libraries(protoserver
|
target_link_libraries(protoserver
|
||||||
hyperion
|
hyperion
|
||||||
hyperion-utils
|
hyperion-utils
|
||||||
${PROTOBUF_LIBRARIES})
|
${PROTOBUF_LIBRARIES}
|
||||||
|
${QT_LIBRARIES})
|
||||||
qt4_use_modules(protoserver
|
|
||||||
Core
|
|
||||||
Gui
|
|
||||||
Network)
|
|
||||||
|
@ -28,11 +28,7 @@ add_executable(hyperion-remote
|
|||||||
${hyperion-remote_HEADERS}
|
${hyperion-remote_HEADERS}
|
||||||
${hyperion-remote_SOURCES})
|
${hyperion-remote_SOURCES})
|
||||||
|
|
||||||
qt4_use_modules(hyperion-remote
|
|
||||||
Core
|
|
||||||
Gui
|
|
||||||
Network)
|
|
||||||
|
|
||||||
target_link_libraries(hyperion-remote
|
target_link_libraries(hyperion-remote
|
||||||
jsoncpp
|
jsoncpp
|
||||||
getoptPlusPlus)
|
getoptPlusPlus
|
||||||
|
${QT_LIBRARIES})
|
||||||
|
@ -49,9 +49,5 @@ target_link_libraries(hyperion-v4l2
|
|||||||
hyperion-utils
|
hyperion-utils
|
||||||
${PROTOBUF_LIBRARIES}
|
${PROTOBUF_LIBRARIES}
|
||||||
pthread
|
pthread
|
||||||
|
${QT_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
qt4_use_modules(hyperion-v4l2
|
|
||||||
Core
|
|
||||||
Gui
|
|
||||||
Network)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user