From e242e4643b4eb58646021b8fcad992d64cb8ac3b Mon Sep 17 00:00:00 2001 From: Ian Rees Date: Sat, 13 Feb 2016 13:45:27 +1300 Subject: [PATCH] Add cmake checks for BUILD_GUI to some modules --- src/Mod/Arch/CMakeLists.txt | 16 ++++++++++------ src/Mod/Draft/CMakeLists.txt | 14 +++++++++----- src/Mod/Material/CMakeLists.txt | 14 +++++++++----- src/Mod/OpenSCAD/CMakeLists.txt | 14 +++++++++----- src/Mod/Plot/CMakeLists.txt | 14 +++++++++----- src/Mod/Ship/CMakeLists.txt | 14 +++++++++----- 6 files changed, 55 insertions(+), 31 deletions(-) diff --git a/src/Mod/Arch/CMakeLists.txt b/src/Mod/Arch/CMakeLists.txt index b6dbf583d6..7f39525505 100644 --- a/src/Mod/Arch/CMakeLists.txt +++ b/src/Mod/Arch/CMakeLists.txt @@ -1,4 +1,6 @@ -PYSIDE_WRAP_RC(Arch_QRC_SRCS Resources/Arch.qrc) +IF (BUILD_GUI) + PYSIDE_WRAP_RC(Arch_QRC_SRCS Resources/Arch.qrc) +ENDIF (BUILD_GUI) SET(Arch_SRCS Init.py @@ -53,10 +55,12 @@ fc_target_copy_resource(Arch ${Arch_presets} ) -fc_target_copy_resource(Arch - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/Arch - Arch_rc.py) +IF (BUILD_GUI) + fc_target_copy_resource(Arch + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/Mod/Arch + Arch_rc.py) +ENDIF (BUILD_GUI) INSTALL( FILES @@ -71,4 +75,4 @@ INSTALL( DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Arch FILES_MATCHING PATTERN "*.csv*" -) \ No newline at end of file +) diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index f4bf239b63..90ba029b9e 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -1,6 +1,8 @@ add_subdirectory(App) -PYSIDE_WRAP_RC(Draft_QRC_SRCS Resources/Draft.qrc) +IF (BUILD_GUI) + PYSIDE_WRAP_RC(Draft_QRC_SRCS Resources/Draft.qrc) +ENDIF (BUILD_GUI) SET(Draft_SRCS Init.py @@ -28,10 +30,12 @@ ADD_CUSTOM_TARGET(Draft ALL fc_copy_sources(Draft "${CMAKE_BINARY_DIR}/Mod/Draft" ${Draft_SRCS}) -fc_target_copy_resource(Draft - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/Draft - Draft_rc.py) +IF (BUILD_GUI) + fc_target_copy_resource(Draft + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/Mod/Draft + Draft_rc.py) +ENDIF (BUILD_GUI) INSTALL( FILES diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt index ca27c96074..6e2610d729 100644 --- a/src/Mod/Material/CMakeLists.txt +++ b/src/Mod/Material/CMakeLists.txt @@ -1,4 +1,6 @@ -PYSIDE_WRAP_RC(Material_QRC_SRCS Resources/Material.qrc) +IF (BUILD_GUI) + PYSIDE_WRAP_RC(Material_QRC_SRCS Resources/Material.qrc) +ENDIF (BUILD_GUI) SET(Material_SRCS Init.py @@ -34,10 +36,12 @@ fc_target_copy_resource(Material ${CMAKE_BINARY_DIR}/Mod/Material ${Material_SRCS}) -fc_target_copy_resource(Material - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/Material - Material_rc.py) +IF (BUILD_GUI) + fc_target_copy_resource(Material + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/Mod/Material + Material_rc.py) +ENDIF (BUILD_GUI) ADD_CUSTOM_TARGET(MaterialLib ALL SOURCES ${MaterialLib_Files} diff --git a/src/Mod/OpenSCAD/CMakeLists.txt b/src/Mod/OpenSCAD/CMakeLists.txt index e8b3dd2dd8..462ac7a792 100644 --- a/src/Mod/OpenSCAD/CMakeLists.txt +++ b/src/Mod/OpenSCAD/CMakeLists.txt @@ -1,4 +1,6 @@ -PYSIDE_WRAP_RC(OpenSCAD_QRC_SRCS Resources/OpenSCAD.qrc) +IF (BUILD_GUI) + PYSIDE_WRAP_RC(OpenSCAD_QRC_SRCS Resources/OpenSCAD.qrc) +ENDIF (BUILD_GUI) SET(OpenSCAD_SRCS Init.py @@ -32,10 +34,12 @@ ADD_CUSTOM_TARGET(OpenSCAD ALL fc_copy_sources(OpenSCAD "${CMAKE_BINARY_DIR}/Mod/OpenSCAD" ${all_files}) -fc_target_copy_resource(OpenSCAD - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/OpenSCAD - OpenSCAD_rc.py) +IF (BUILD_GUI) + fc_target_copy_resource(OpenSCAD + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/Mod/OpenSCAD + OpenSCAD_rc.py) +ENDIF (BUILD_GUI) INSTALL( FILES diff --git a/src/Mod/Plot/CMakeLists.txt b/src/Mod/Plot/CMakeLists.txt index 7760f623ce..03b8201acd 100644 --- a/src/Mod/Plot/CMakeLists.txt +++ b/src/Mod/Plot/CMakeLists.txt @@ -1,4 +1,6 @@ -PYSIDE_WRAP_RC(Plot_QRC_SRCS resources/Plot.qrc) +IF (BUILD_GUI) + PYSIDE_WRAP_RC(Plot_QRC_SRCS resources/Plot.qrc) +ENDIF (BUILD_GUI) SET(PlotMain_SRCS Plot.py @@ -56,10 +58,12 @@ ADD_CUSTOM_TARGET(Plot ALL fc_copy_sources(Plot "${CMAKE_BINARY_DIR}/Mod/Plot" ${all_files}) -fc_target_copy_resource(Plot - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/Plot - Plot_rc.py) +IF (BUILD_GUI) + fc_target_copy_resource(Plot + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/Mod/Plot + Plot_rc.py) +ENDIF (BUILD_GUI) INSTALL( FILES diff --git a/src/Mod/Ship/CMakeLists.txt b/src/Mod/Ship/CMakeLists.txt index f69e4ceea9..dfbe44c760 100644 --- a/src/Mod/Ship/CMakeLists.txt +++ b/src/Mod/Ship/CMakeLists.txt @@ -1,4 +1,6 @@ -PYSIDE_WRAP_RC(Ship_QRC_SRCS resources/Ship.qrc) +IF(BUILD_GUI) + PYSIDE_WRAP_RC(Ship_QRC_SRCS resources/Ship.qrc) +ENDIF(BUILD_GUI) SET(ShipMain_SRCS InitGui.py @@ -116,10 +118,12 @@ ADD_CUSTOM_TARGET(Ship ALL fc_copy_sources(Ship "${CMAKE_BINARY_DIR}/Mod/Ship" ${all_files}) -fc_target_copy_resource(Ship - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/Ship - Ship_rc.py) +IF(BUILD_GUI) + fc_target_copy_resource(Ship + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/Mod/Ship + Ship_rc.py) +ENDIF(BUILD_GUI) INSTALL( FILES