Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issues #2027: trim on cirlce(arc will be created). Result of selected will clear...
[modules/shaper.git]
/
src
/
CollectionPlugin
/
CMakeLists.txt
diff --git
a/src/CollectionPlugin/CMakeLists.txt
b/src/CollectionPlugin/CMakeLists.txt
index 16e2b216639f0623e89d6693c5c29ecbe6407c17..9b896ba5df58794edc942872a41f1d8072464deb 100644
(file)
--- a/
src/CollectionPlugin/CMakeLists.txt
+++ b/
src/CollectionPlugin/CMakeLists.txt
@@
-2,22
+2,33
@@
INCLUDE(Common)
INCLUDE(UnitTest)
INCLUDE(Common)
INCLUDE(UnitTest)
+INCLUDE(UseQtExt)
+
+# additional include directories
+INCLUDE_DIRECTORIES(${QT_INCLUDES})
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${QT_DEFINITIONS})
SET(PROJECT_HEADERS
CollectionPlugin.h
CollectionPlugin_Plugin.h
CollectionPlugin_Group.h
CollectionPlugin_Field.h
SET(PROJECT_HEADERS
CollectionPlugin.h
CollectionPlugin_Plugin.h
CollectionPlugin_Group.h
CollectionPlugin_Field.h
- CollectionPlugin_WidgetCreator.h
- CollectionPlugin_WidgetField.h
+ CollectionPlugin_WidgetCreator.h
+ CollectionPlugin_WidgetField.h
+)
+
+SET(PROJECT_MOC_HEADERS
+ CollectionPlugin_WidgetField.h
)
SET(PROJECT_SOURCES
CollectionPlugin_Plugin.cpp
CollectionPlugin_Group.cpp
CollectionPlugin_Field.cpp
)
SET(PROJECT_SOURCES
CollectionPlugin_Plugin.cpp
CollectionPlugin_Group.cpp
CollectionPlugin_Field.cpp
-
CollectionPlugin_WidgetCreator.cpp
-
CollectionPlugin_WidgetField.cpp
+ CollectionPlugin_WidgetCreator.cpp
+ CollectionPlugin_WidgetField.cpp
)
SET(XML_RESOURCES
)
SET(XML_RESOURCES
@@
-29,6
+40,12
@@
SET(TEXT_RESOURCES
CollectionPlugin_msg_en.ts
)
CollectionPlugin_msg_en.ts
)
+# sources / moc wrappings
+QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS})
+
+#QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+
+SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
@@
-40,7
+57,6
@@
INCLUDE_DIRECTORIES(
../Events
../ModuleBase
../Config
../Events
../ModuleBase
../Config
- ../XGUI
${CAS_INCLUDE_DIRS}
)
${CAS_INCLUDE_DIRS}
)
@@
-51,11
+67,15
@@
SET(PROJECT_LIBRARIES
GeomAlgoAPI
GeomValidators
ModuleBase
GeomAlgoAPI
GeomValidators
ModuleBase
- XGUI
)
ADD_DEFINITIONS(-DCOLLECTIONPLUGIN_EXPORTS ${CAS_DEFINITIONS})
)
ADD_DEFINITIONS(-DCOLLECTIONPLUGIN_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(CollectionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES})
+ADD_LIBRARY(CollectionPlugin MODULE
+ ${PROJECT_SOURCES}
+ ${PROJECT_HEADERS}
+ ${XML_RESOURCES}
+ ${TEXT_RESOURCES}
+ ${PROJECT_AUTOMOC})
TARGET_LINK_LIBRARIES(CollectionPlugin ${PROJECT_LIBRARIES})
INSTALL(TARGETS CollectionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
TARGET_LINK_LIBRARIES(CollectionPlugin ${PROJECT_LIBRARIES})
INSTALL(TARGETS CollectionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
@@
-66,4
+86,5
@@
INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
ADD_UNIT_TESTS(
TestGroup.py
TestField.py
ADD_UNIT_TESTS(
TestGroup.py
TestField.py
+ TestGroup1799.py
)
)