From e8b0963c64ad81be042fffe660ce874ae4d3abd5 Mon Sep 17 00:00:00 2001 From: Artem Zhidkov Date: Mon, 18 May 2020 09:16:39 +0300 Subject: [PATCH] Cosmetics. Move XML files to the separate folder inside a corresponding project in VS. --- src/BuildPlugin/CMakeLists.txt | 1 + src/CollectionPlugin/CMakeLists.txt | 1 + src/ConstructionPlugin/CMakeLists.txt | 1 + src/ExchangePlugin/CMakeLists.txt | 4 +++- src/FeaturesPlugin/CMakeLists.txt | 1 + src/FiltersPlugin/CMakeLists.txt | 2 ++ src/GDMLPlugin/CMakeLists.txt | 2 ++ src/ParametersPlugin/CMakeLists.txt | 1 + src/PartSet/CMakeLists.txt | 2 -- src/PartSetPlugin/CMakeLists.txt | 1 + src/PrimitivesPlugin/CMakeLists.txt | 1 + src/SketchPlugin/CMakeLists.txt | 6 ++---- 12 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/BuildPlugin/CMakeLists.txt b/src/BuildPlugin/CMakeLists.txt index 385367bba..7969baed0 100644 --- a/src/BuildPlugin/CMakeLists.txt +++ b/src/BuildPlugin/CMakeLists.txt @@ -88,6 +88,7 @@ SET(TEXT_RESOURCES BuildPlugin_msg_fr.ts ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) SET(PROJECT_LIBRARIES diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt index 23d28251d..bd65ca86a 100644 --- a/src/CollectionPlugin/CMakeLists.txt +++ b/src/CollectionPlugin/CMakeLists.txt @@ -78,6 +78,7 @@ QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) INCLUDE_DIRECTORIES( diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt index 733c84739..3f75a54af 100644 --- a/src/ConstructionPlugin/CMakeLists.txt +++ b/src/ConstructionPlugin/CMakeLists.txt @@ -57,6 +57,7 @@ SET(PROJECT_LIBRARIES GeomDataAPI ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS) diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt index 956bc8128..f6c615e96 100644 --- a/src/ExchangePlugin/CMakeLists.txt +++ b/src/ExchangePlugin/CMakeLists.txt @@ -67,6 +67,9 @@ SET(TEXT_RESOURCES ExchangePlugin_msg_fr.ts ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) +SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) + SET(PROJECT_LIBRARIES Events Config @@ -77,7 +80,6 @@ SET(PROJECT_LIBRARIES GeomValidators XAOShaper ) -SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) # default dump approaches (will be set if not initialized) SET(PYTHONDUMP_NAMING ON CACHE BOOL "Dump named references to shapes") diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index ff4de8cad..3dd2b67f8 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -154,6 +154,7 @@ SET(TEXT_RESOURCES FeaturesPlugin_msg_ru.ts ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) diff --git a/src/FiltersPlugin/CMakeLists.txt b/src/FiltersPlugin/CMakeLists.txt index e1da56473..7c294c82f 100644 --- a/src/FiltersPlugin/CMakeLists.txt +++ b/src/FiltersPlugin/CMakeLists.txt @@ -78,6 +78,8 @@ SET(XML_RESOURCES filter-TopoConnectedFaces.xml ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) + ADD_DEFINITIONS(-DFILTERS_EXPORTS ${OpenCASCADE_DEFINITIONS}) ADD_LIBRARY(FiltersPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(FiltersPlugin ${PROJECT_LIBRARIES}) diff --git a/src/GDMLPlugin/CMakeLists.txt b/src/GDMLPlugin/CMakeLists.txt index d87d32a9d..7cb4ba5b9 100644 --- a/src/GDMLPlugin/CMakeLists.txt +++ b/src/GDMLPlugin/CMakeLists.txt @@ -41,6 +41,8 @@ SET(XML_RESOURCES ellipsoid_widget.xml ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) + INCLUDE_DIRECTORIES( ../ModelAPI ../GeomAPI diff --git a/src/ParametersPlugin/CMakeLists.txt b/src/ParametersPlugin/CMakeLists.txt index 06ec324cd..d9d1a864c 100644 --- a/src/ParametersPlugin/CMakeLists.txt +++ b/src/ParametersPlugin/CMakeLists.txt @@ -96,6 +96,7 @@ QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${QM_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) ADD_LIBRARY(ParametersPlugin MODULE ${PROJECT_SOURCES} diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt index d869c8b93..851ad9d0e 100644 --- a/src/PartSet/CMakeLists.txt +++ b/src/PartSet/CMakeLists.txt @@ -158,9 +158,7 @@ ELSE(${UPDATE_TRANSLATION}) ENDIF(${UPDATE_TRANSLATION}) SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES}) -#SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES}) -#SOURCE_GROUP ("Resource Files" FILES ${PROJECT_RESOURCES}) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI ${PROJECT_SOURCE_DIR}/src/Config diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt index bd692227b..21fa1af41 100644 --- a/src/PartSetPlugin/CMakeLists.txt +++ b/src/PartSetPlugin/CMakeLists.txt @@ -42,6 +42,7 @@ SET(TEXT_RESOURCES PartSetPlugin_msg_fr.ts ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) ADD_DEFINITIONS(-DPARTSETPLUGIN_EXPORTS) diff --git a/src/PrimitivesPlugin/CMakeLists.txt b/src/PrimitivesPlugin/CMakeLists.txt index b74a7ffe1..fb5117234 100644 --- a/src/PrimitivesPlugin/CMakeLists.txt +++ b/src/PrimitivesPlugin/CMakeLists.txt @@ -49,6 +49,7 @@ SET(TEXT_RESOURCES PrimitivesPlugin_msg_fr.ts ) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) INCLUDE_DIRECTORIES( diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 0a4a01218..2fd61c769 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -151,14 +151,12 @@ SET(TEXT_RESOURCES SketchPlugin_msg_fr.ts ) -# sources / moc wrappings -QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS}) - SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) +SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES}) ADD_DEFINITIONS(-DSKETCHPLUGIN_EXPORTS) -ADD_LIBRARY(SketchPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES} ${PROJECT_AUTOMOC}) +ADD_LIBRARY(SketchPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES}) TARGET_LINK_LIBRARIES(SketchPlugin ${PROJECT_LIBRARIES}) INCLUDE_DIRECTORIES( -- 2.39.2