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
Merge branch 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
PartSet
/
CMakeLists.txt
diff --git
a/src/PartSet/CMakeLists.txt
b/src/PartSet/CMakeLists.txt
index abba90df240d7a11bec858c4188c76a732297954..4d4de17e1af317af0f4167b2e3de867e87acd215 100644
(file)
--- a/
src/PartSet/CMakeLists.txt
+++ b/
src/PartSet/CMakeLists.txt
@@
-5,19
+5,9
@@
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
PartSet.h
PartSet_Constants.h
SET(PROJECT_HEADERS
PartSet.h
PartSet_Constants.h
- PartSet_ConstraintDistancePrs.h
- PartSet_ConstraintLengthPrs.h
- PartSet_ConstraintRadiusPrs.h
PartSet_EditLine.h
PartSet_EditLine.h
- PartSet_FeatureArcPrs.h
- PartSet_FeatureCirclePrs.h
- PartSet_FeaturePrs.h
- PartSet_FeatureLinePrs.h
- PartSet_FeaturePointPrs.h
PartSet_Listener.h
PartSet_Module.h
PartSet_Listener.h
PartSet_Module.h
- PartSet_OperationCreateConstraint.h
- PartSet_OperationCreateFeature.h
PartSet_OperationFeatureCreate.h
PartSet_OperationFeatureEdit.h
PartSet_OperationFeatureEditMulti.h
PartSet_OperationFeatureCreate.h
PartSet_OperationFeatureEdit.h
PartSet_OperationFeatureEditMulti.h
@@
-25,22
+15,14
@@
SET(PROJECT_HEADERS
PartSet_OperationSketch.h
PartSet_TestOCC.h
PartSet_Tools.h
PartSet_OperationSketch.h
PartSet_TestOCC.h
PartSet_Tools.h
+ PartSet_WidgetSketchLabel.h
+ PartSet_Validators.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
- PartSet_ConstraintDistancePrs.cpp
- PartSet_ConstraintLengthPrs.cpp
- PartSet_ConstraintRadiusPrs.cpp
PartSet_EditLine.cpp
PartSet_EditLine.cpp
- PartSet_FeaturePrs.cpp
- PartSet_FeatureArcPrs.cpp
- PartSet_FeatureCirclePrs.cpp
- PartSet_FeatureLinePrs.cpp
- PartSet_FeaturePointPrs.cpp
PartSet_Listener.cpp
PartSet_Module.cpp
PartSet_Listener.cpp
PartSet_Module.cpp
- PartSet_OperationCreateConstraint.cpp
- PartSet_OperationCreateFeature.cpp
PartSet_OperationFeatureCreate.cpp
PartSet_OperationFeatureEdit.cpp
PartSet_OperationFeatureEditMulti.cpp
PartSet_OperationFeatureCreate.cpp
PartSet_OperationFeatureEdit.cpp
PartSet_OperationFeatureEditMulti.cpp
@@
-48,6
+30,8
@@
SET(PROJECT_SOURCES
PartSet_OperationSketch.cpp
PartSet_TestOCC.cpp
PartSet_Tools.cpp
PartSet_OperationSketch.cpp
PartSet_TestOCC.cpp
PartSet_Tools.cpp
+ PartSet_WidgetSketchLabel.cpp
+ PartSet_Validators.cpp
)
SET(PROJECT_RESOURCES
)
SET(PROJECT_RESOURCES
@@
-86,7
+70,6
@@
SOURCE_GROUP ("Resource Files" FILES ${PROJECT_RESOURCES})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
${CMAKE_SOURCE_DIR}/src/Config
${CMAKE_SOURCE_DIR}/src/Events
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
${CMAKE_SOURCE_DIR}/src/Config
${CMAKE_SOURCE_DIR}/src/Events
- ${CMAKE_SOURCE_DIR}/src/Model
${CMAKE_SOURCE_DIR}/src/ModuleBase
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
${CMAKE_SOURCE_DIR}/src/ModuleBase
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
@@
-106,7
+89,7
@@
ADD_LIBRARY(PartSet SHARED
)
# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
)
# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
-TARGET_LINK_LIBRARIES(PartSet ${PROJECT_LIBRARIES} XGUI ModelAPI
Model
GeomAlgoAPI)
+TARGET_LINK_LIBRARIES(PartSet ${PROJECT_LIBRARIES} XGUI ModelAPI GeomAlgoAPI)
ADD_DEPENDENCIES(PartSet ModuleBase)
ADD_DEPENDENCIES(PartSet ModuleBase)