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 a111f81615c78088ba59030839c09e24d9462ae7..de011a1b944183dfcef70933a90d699c903aa0f3 100644
(file)
--- a/
src/PartSet/CMakeLists.txt
+++ b/
src/PartSet/CMakeLists.txt
@@
-13,8
+13,10
@@
SET(PROJECT_HEADERS
PartSet_OperationFeatureEditMulti.h
PartSet_OperationSketchBase.h
PartSet_OperationSketch.h
PartSet_OperationFeatureEditMulti.h
PartSet_OperationSketchBase.h
PartSet_OperationSketch.h
- PartSet_
TestOCC
.h
+ PartSet_
OperationFeatureBase
.h
PartSet_Tools.h
PartSet_Tools.h
+ PartSet_WidgetSketchLabel.h
+ PartSet_Validators.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
@@
-26,8
+28,10
@@
SET(PROJECT_SOURCES
PartSet_OperationFeatureEditMulti.cpp
PartSet_OperationSketchBase.cpp
PartSet_OperationSketch.cpp
PartSet_OperationFeatureEditMulti.cpp
PartSet_OperationSketchBase.cpp
PartSet_OperationSketch.cpp
- PartSet_
TestOCC
.cpp
+ PartSet_
OperationFeatureBase
.cpp
PartSet_Tools.cpp
PartSet_Tools.cpp
+ PartSet_WidgetSketchLabel.cpp
+ PartSet_Validators.cpp
)
SET(PROJECT_RESOURCES
)
SET(PROJECT_RESOURCES
@@
-44,6
+48,7
@@
SET(PROJECT_LIBRARIES
GeomAPI
${QT_LIBRARIES}
${CAS_KERNEL}
GeomAPI
${QT_LIBRARIES}
${CAS_KERNEL}
+ ${CAS_SHAPE}
)
SET(PROJECT_AUTOMOC
)
SET(PROJECT_AUTOMOC
@@
-66,7
+71,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
@@
-74,6
+78,7
@@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
${CMAKE_SOURCE_DIR}/src/SketchPlugin
${CMAKE_SOURCE_DIR}/src/GeomAPI
${CAS_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/src/SketchPlugin
${CMAKE_SOURCE_DIR}/src/GeomAPI
${CAS_INCLUDE_DIRS}
+ ${SUIT_INCLUDE}
)
ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS})
)
ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS})
@@
-86,9
+91,9
@@
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)
INSTALL(TARGETS PartSet DESTINATION bin)
ADD_DEPENDENCIES(PartSet ModuleBase)
INSTALL(TARGETS PartSet DESTINATION bin)
-#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
\ No newline at end of file
+#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)