From 5e091c0bcb490d7e6c27f255983c827186a4e00d Mon Sep 17 00:00:00 2001 From: mpv Date: Fri, 24 Jun 2016 21:01:36 +0300 Subject: [PATCH] Correction of CMake files for correct management of translation files. --- src/BuildPlugin/CMakeLists.txt | 10 ++++++++-- src/ConstructionPlugin/CMakeLists.txt | 10 ++++++++-- src/ExchangePlugin/CMakeLists.txt | 2 +- src/FeaturesPlugin/CMakeLists.txt | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/BuildPlugin/CMakeLists.txt b/src/BuildPlugin/CMakeLists.txt index ad77b74a9..0fef6b358 100644 --- a/src/BuildPlugin/CMakeLists.txt +++ b/src/BuildPlugin/CMakeLists.txt @@ -44,6 +44,12 @@ SET(XML_RESOURCES subshapes_widget.xml ) +SET(TEXT_RESOURCES + BuildPlugin_msg_en.ts +) + +SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) + SET(PROJECT_LIBRARIES Events Config @@ -54,12 +60,12 @@ SET(PROJECT_LIBRARIES ) ADD_DEFINITIONS(-DBUILDPLUGIN_EXPORTS) -ADD_LIBRARY(BuildPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) +ADD_LIBRARY(BuildPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES}) TARGET_LINK_LIBRARIES(BuildPlugin ${PROJECT_LIBRARIES}) INSTALL(TARGETS BuildPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) -INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${XML_RESOURCES} ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Build) ADD_UNIT_TESTS(TestVertex.py diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt index 3b149668a..5fd66b7b8 100644 --- a/src/ConstructionPlugin/CMakeLists.txt +++ b/src/ConstructionPlugin/CMakeLists.txt @@ -25,6 +25,10 @@ SET(XML_RESOURCES plane_widget.xml ) +SET(TEXT_RESOURCES + ConstructionPlugin_msg_en.ts +) + SET(PROJECT_LIBRARIES Config ModelAPI @@ -32,12 +36,14 @@ SET(PROJECT_LIBRARIES GeomAlgoAPI ) +SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) + ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS) -ADD_LIBRARY(ConstructionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) +ADD_LIBRARY(ConstructionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES}) TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES}) INSTALL(TARGETS ConstructionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) -INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${XML_RESOURCES} ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Construction) INCLUDE_DIRECTORIES( diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt index b1c58c676..0745869ce 100644 --- a/src/ExchangePlugin/CMakeLists.txt +++ b/src/ExchangePlugin/CMakeLists.txt @@ -34,7 +34,7 @@ SET(XML_RESOURCES ) SET(TEXT_RESOURCES - ExchangePlugin_msg_en.ts + ExchangePlugin_msg_en.ts ) SET(PROJECT_LIBRARIES diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index da400c140..451b9c002 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -77,7 +77,7 @@ SET(XML_RESOURCES ) SET(TEXT_RESOURCES - FeaturesPlugin_msg_en.ts + FeaturesPlugin_msg_en.ts ) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) -- 2.39.2