From 681d22226ae0532604e674bc4af1811a160ee80a Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 20 Aug 2018 20:00:53 +0200 Subject: [PATCH] CMP0050: make Robot module aware of cmake policy --- src/Mod/Robot/App/CMakeLists.txt | 34 --------------------- src/Mod/Robot/CMakeLists.txt | 52 ++++++++++++++++++++++++++++---- src/Mod/Robot/Gui/CMakeLists.txt | 25 ++++++--------- 3 files changed, 55 insertions(+), 56 deletions(-) diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index 3a5ab58f99..f794c28112 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -122,43 +122,9 @@ SET(Robot_SRCS SOURCE_GROUP("Python" FILES ${Python_SRCS}) SOURCE_GROUP("Module" FILES ${Mod_SRCS}) -SET(Robot_Scripts - Init.py - KukaExporter.py - RobotExample.py - RobotExampleTrajectoryOutOfShapes.py -) - -if (EXISTS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/Lib/Kuka) -SET(Robot_Resources - Lib/Kuka/kr500_1.wrl - Lib/Kuka/kr500_1.csv - Lib/Kuka/kr_500_2.pdf - Lib/Kuka/kr210.WRL - Lib/Kuka/kr_210_2.csv - Lib/Kuka/kr_210_2.pdf - Lib/Kuka/kr16.wrl - Lib/Kuka/kr_16.csv - Lib/Kuka/kr_16.pdf - Lib/Kuka/kr125_3.wrl - Lib/Kuka/kr_125.csv - Lib/Kuka/kr125_2.pdf -) -endif () - add_library(Robot SHARED ${Robot_SRCS}) target_link_libraries(Robot ${Robot_LIBS}) -fc_target_copy_resource(Robot - ${CMAKE_SOURCE_DIR}/src/Mod/Robot - ${CMAKE_BINARY_DIR}/Mod/Robot - ${Robot_Scripts}) - -fc_target_copy_resource(Robot - ${CMAKE_SOURCE_DIR}/src/Mod/Robot - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot - ${Robot_Resources}) - SET_BIN_DIR(Robot Robot /Mod/Robot) SET_PYTHON_PREFIX_SUFFIX(Robot) diff --git a/src/Mod/Robot/CMakeLists.txt b/src/Mod/Robot/CMakeLists.txt index fa7cea7db1..03376fce7a 100644 --- a/src/Mod/Robot/CMakeLists.txt +++ b/src/Mod/Robot/CMakeLists.txt @@ -4,14 +4,54 @@ if(BUILD_GUI) add_subdirectory(Gui) endif(BUILD_GUI) +set(Robot_Scripts + Init.py + KukaExporter.py + RobotExample.py + RobotExampleTrajectoryOutOfShapes.py +) + +if(BUILD_GUI) + list (APPEND Robot_Scripts + InitGui.py + MovieTool.py + ) +endif(BUILD_GUI) + +if (EXISTS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/Lib/Kuka) +SET(Robot_Resources + Lib/Kuka/kr500_1.wrl + Lib/Kuka/kr500_1.csv + Lib/Kuka/kr_500_2.pdf + Lib/Kuka/kr210.WRL + Lib/Kuka/kr_210_2.csv + Lib/Kuka/kr_210_2.pdf + Lib/Kuka/kr16.wrl + Lib/Kuka/kr_16.csv + Lib/Kuka/kr_16.pdf + Lib/Kuka/kr125_3.wrl + Lib/Kuka/kr_125.csv + Lib/Kuka/kr125_2.pdf +) +endif () + +add_custom_target(RobotScripts ALL + SOURCES ${Robot_Scripts} ${Robot_Resources} +) + +fc_target_copy_resource(RobotScripts + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/Mod/Robot + ${Robot_Scripts}) + +fc_target_copy_resource(RobotScripts + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot + ${Robot_Resources}) + INSTALL( FILES - Init.py - InitGui.py - KukaExporter.py - MovieTool.py - RobotExample.py - RobotExampleTrajectoryOutOfShapes.py + ${Robot_Scripts} DESTINATION Mod/Robot ) diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 3daf6643ec..7aea7b2639 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -148,26 +148,19 @@ SET(RobotGui_SRCS ${RobotGui_SRCS_TaskDlg} ) - - -add_library(RobotGui SHARED ${RobotGui_SRCS}) -target_link_libraries(RobotGui ${RobotGui_LIBS}) - - -fc_target_copy_resource(RobotGui - ${CMAKE_SOURCE_DIR}/src/Mod/Robot - ${CMAKE_BINARY_DIR}/Mod/Robot - InitGui.py MovieTool.py) - -SET_BIN_DIR(RobotGui RobotGui /Mod/Robot) -SET_PYTHON_PREFIX_SUFFIX(RobotGui) - -INSTALL(TARGETS RobotGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) - SET(RobotGuiIcon_SVG Resources/icons/RobotWorkbench.svg ) + +add_library(RobotGui SHARED ${RobotGui_SRCS} ${RobotGuiIcon_SVG}) +target_link_libraries(RobotGui ${RobotGui_LIBS}) + + +SET_BIN_DIR(RobotGui RobotGui /Mod/Robot) +SET_PYTHON_PREFIX_SUFFIX(RobotGui) + fc_copy_sources(RobotGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot" ${RobotGuiIcon_SVG}) +INSTALL(TARGETS RobotGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL(FILES ${RobotGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Robot/Resources/icons")