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 7e4e35034339559c403e7ef4276fbc66e64cf2e0..4d4de17e1af317af0f4167b2e3de867e87acd215 100644
(file)
--- a/
src/PartSet/CMakeLists.txt
+++ b/
src/PartSet/CMakeLists.txt
@@
-1,27
+1,37
@@
INCLUDE(Common)
INCLUDE(Common)
-INCLUDE(FindCAS)
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
PartSet.h
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
PartSet.h
+ PartSet_Constants.h
+ PartSet_EditLine.h
PartSet_Listener.h
PartSet_Module.h
PartSet_Listener.h
PartSet_Module.h
- PartSet_OperationEditLine.h
+ PartSet_OperationFeatureCreate.h
+ PartSet_OperationFeatureEdit.h
+ PartSet_OperationFeatureEditMulti.h
PartSet_OperationSketchBase.h
PartSet_OperationSketch.h
PartSet_OperationSketchBase.h
PartSet_OperationSketch.h
- PartSet_
OperationSketchLine
.h
+ PartSet_
TestOCC
.h
PartSet_Tools.h
PartSet_Tools.h
+ PartSet_WidgetSketchLabel.h
+ PartSet_Validators.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
+ PartSet_EditLine.cpp
PartSet_Listener.cpp
PartSet_Module.cpp
PartSet_Listener.cpp
PartSet_Module.cpp
- PartSet_OperationEditLine.cpp
+ PartSet_OperationFeatureCreate.cpp
+ PartSet_OperationFeatureEdit.cpp
+ PartSet_OperationFeatureEditMulti.cpp
PartSet_OperationSketchBase.cpp
PartSet_OperationSketch.cpp
PartSet_OperationSketchBase.cpp
PartSet_OperationSketch.cpp
- PartSet_
OperationSketchLine
.cpp
+ PartSet_
TestOCC
.cpp
PartSet_Tools.cpp
PartSet_Tools.cpp
+ PartSet_WidgetSketchLabel.cpp
+ PartSet_Validators.cpp
)
SET(PROJECT_RESOURCES
)
SET(PROJECT_RESOURCES
@@
-60,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
@@
-80,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)