diff options
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/cli/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/bin/mobile/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/bin/webserver/CMakeLists.txt | 1 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/bin/cli/CMakeLists.txt b/src/bin/cli/CMakeLists.txt index 07d080f..e1d2b4b 100644 --- a/src/bin/cli/CMakeLists.txt +++ b/src/bin/cli/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) +#project(dice) option(UPDATE_TRANSLATIONS "update Translation" OFF) option(NO_PAINTER_OPERATOR "No PAINTING" OFF) MESSAGE(STATUS "UPDATE TRANSLATIONS: ${UPDATE_TRANSLATIONS}") -project(dice) # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -60,4 +60,13 @@ IF(NO_PAINTER_OPERATOR) ELSE() target_link_libraries(dice PUBLIC Qt6::Core Qt6::Gui Qt6::Svg PRIVATE diceparser_shared) ENDIF() -INSTALL_TARGETS(/bin dice) + +include(install_helper OPTIONAL RESULT_VARIABLE=installFound) + + +if(installFound STREQUAL "NOTFOUND") + install(TARGETS dice RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT diceComp) +else() + set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackConfigDice.cmake") + rinstallRT(dice "diceComp") +endif() diff --git a/src/bin/mobile/CMakeLists.txt b/src/bin/mobile/CMakeLists.txt index ddc0543..8c9627a 100644 --- a/src/bin/mobile/CMakeLists.txt +++ b/src/bin/mobile/CMakeLists.txt @@ -104,6 +104,5 @@ qt5_add_resources(RESOURCE_ADDED mobile.qrc) add_executable( diceGui ${diceGui_sources} ${diceGui_QM} ${RESOURCE_ADDED} ) target_link_libraries(diceGui ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Qml_LIBRARIES} ${Qt5Quick_LIBRARIES}) -INSTALL_TARGETS(/bin diceGui) #qt5_use_modules() diff --git a/src/bin/webserver/CMakeLists.txt b/src/bin/webserver/CMakeLists.txt index 3fa9b56..49d0d74 100644 --- a/src/bin/webserver/CMakeLists.txt +++ b/src/bin/webserver/CMakeLists.txt @@ -73,6 +73,5 @@ SET( diceserver_sources add_executable( diceserver ${diceserver_sources} ) target_link_libraries(diceserver ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} /home/renaud/application/mine/DiceParser/webserver/qhttp/xbin/libqhttp.so) -INSTALL_TARGETS(/bin diceserver) #qt5_use_modules() |