mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
cmake 3.0.0 (#480)
This commit is contained in:
@@ -21,10 +21,8 @@ CONFIGURE_FILE(${CURRENT_SOURCE_DIR}/EffectEngine.qrc.in ${CMAKE_BINARY_DIR}/Eff
|
||||
|
||||
SET(EffectEngine_RESOURCES ${CMAKE_BINARY_DIR}/EffectEngine.qrc)
|
||||
|
||||
qt5_add_resources(EffectEngine_RESOURCES_RCC ${EffectEngine_RESOURCES} ) # OPTIONS "-no-compress"
|
||||
|
||||
add_library(effectengine
|
||||
${EffectEngine_RESOURCES_RCC}
|
||||
${EffectEngine_RESOURCES}
|
||||
${EffectEngineSOURCES}
|
||||
)
|
||||
|
||||
|
@@ -5,11 +5,11 @@ SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/hyperion)
|
||||
|
||||
FILE ( GLOB Hyperion_SOURCES "${CURRENT_HEADER_DIR}/*.h" "${CURRENT_SOURCE_DIR}/*.h" "${CURRENT_SOURCE_DIR}/*.cpp" )
|
||||
|
||||
QT5_ADD_RESOURCES(Hyperion_RESOURCES_RCC ${CURRENT_SOURCE_DIR}/resource.qrc OPTIONS "-no-compress")
|
||||
SET(Hyperion_RESOURCES ${CURRENT_SOURCE_DIR}/resource.qrc)
|
||||
|
||||
add_library(hyperion
|
||||
${Hyperion_SOURCES}
|
||||
${Hyperion_RESOURCES_RCC}
|
||||
${Hyperion_RESOURCES}
|
||||
)
|
||||
|
||||
target_link_libraries(hyperion
|
||||
|
@@ -15,7 +15,7 @@ include_directories(
|
||||
dev_tinker
|
||||
)
|
||||
|
||||
FILE ( GLOB Leddevice_SOURCES
|
||||
FILE ( GLOB Leddevice_SOURCES
|
||||
"${CURRENT_HEADER_DIR}/*.h"
|
||||
"${CURRENT_SOURCE_DIR}/*.h"
|
||||
"${CURRENT_SOURCE_DIR}/*.cpp"
|
||||
@@ -51,12 +51,9 @@ endif()
|
||||
|
||||
set(LedDevice_RESOURCES ${CURRENT_SOURCE_DIR}/LedDeviceSchemas.qrc )
|
||||
|
||||
qt5_add_resources(LedDevice_RESOURCES_RCC ${LedDevice_RESOURCES} OPTIONS "-no-compress")
|
||||
|
||||
SET( Leddevice_SOURCES
|
||||
SET( Leddevice_SOURCES
|
||||
${Leddevice_SOURCES}
|
||||
${LedDevice_RESOURCES}
|
||||
${LedDevice_RESOURCES_RCC}
|
||||
${Leddevice_USB_HID_SOURCES}
|
||||
${Leddevice_TINKER_SOURCES}
|
||||
${Leddevice_SPI_SOURCES}
|
||||
@@ -101,4 +98,3 @@ if (ENABLE_USB_HID)
|
||||
target_link_libraries(leddevice ${LIBUSB_1_LIBRARIES} hidapi-libusb)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
@@ -11,13 +11,9 @@ endif()
|
||||
|
||||
set(Utils_RESOURCES ${CURRENT_SOURCE_DIR}/JSONRPC_schemas.qrc )
|
||||
|
||||
qt5_add_resources(Utils_RESOURCES_RCC ${Utils_RESOURCES} OPTIONS "-no-compress")
|
||||
|
||||
|
||||
add_library(hyperion-utils
|
||||
${Utils_SOURCES}
|
||||
${Utils_RESOURCES}
|
||||
${Utils_RESOURCES_RCC}
|
||||
)
|
||||
|
||||
target_link_libraries(hyperion-utils
|
||||
|
@@ -13,11 +13,9 @@ ENDFOREACH()
|
||||
CONFIGURE_FILE(${CURRENT_SOURCE_DIR}/WebConfig.qrc.in ${CMAKE_BINARY_DIR}/WebConfig.qrc )
|
||||
SET(WebConfig_RESOURCES ${CMAKE_BINARY_DIR}/WebConfig.qrc)
|
||||
|
||||
qt5_add_resources(WebConfig_RESOURCES_RCC ${WebConfig_RESOURCES} ) #OPTIONS "-no-compress"
|
||||
|
||||
add_library(webconfig
|
||||
${WebConfig_SOURCES}
|
||||
${WebConfig_RESOURCES_RCC}
|
||||
${WebConfig_RESOURCES}
|
||||
)
|
||||
|
||||
target_link_libraries(webconfig
|
||||
|
Reference in New Issue
Block a user