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
26451: Import Result with Groups
[modules/shaper.git]
/
src
/
PartSet
/
CMakeLists.txt
diff --git
a/src/PartSet/CMakeLists.txt
b/src/PartSet/CMakeLists.txt
index 7d025325549ced06a2a6cc2df3e0065b1eb14509..ebc905b4251303ca0ec6c2422c2e55bbdd14cb42 100644
(file)
--- a/
src/PartSet/CMakeLists.txt
+++ b/
src/PartSet/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2014-20
19
CEA/DEN, EDF R&D
+# Copyright (C) 2014-20
21
CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-24,7
+24,7
@@
INCLUDE(UseQtExt)
INCLUDE_DIRECTORIES(${QT_INCLUDES})
# additional preprocessor / compiler flags
INCLUDE_DIRECTORIES(${QT_INCLUDES})
# additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS}
${OpenCASCADE_DEFINITIONS}
)
SET(UPDATE_TRANSLATION OFF)
SET(UPDATE_TRANSLATION OFF)
@@
-59,8
+59,10
@@
SET(PROJECT_HEADERS
PartSet_WidgetSketchLabel.h
PartSet_CenterPrs.h
PartSet_ExternalPointsMgr.h
PartSet_WidgetSketchLabel.h
PartSet_CenterPrs.h
PartSet_ExternalPointsMgr.h
- PartSet_TreeNodes.h
- PartSet_FieldStepPrs.h
+ PartSet_TreeNodes.h
+ PartSet_FieldStepPrs.h
+ PartSet_WidgetBSplinePoints.h
+ PartSet_BSplineWidget.h
)
SET(PROJECT_MOC_HEADERS
)
SET(PROJECT_MOC_HEADERS
@@
-78,7
+80,9
@@
SET(PROJECT_MOC_HEADERS
PartSet_WidgetShapeSelector.h
PartSet_WidgetSketchCreator.h
PartSet_WidgetSketchLabel.h
PartSet_WidgetShapeSelector.h
PartSet_WidgetSketchCreator.h
PartSet_WidgetSketchLabel.h
+ PartSet_WidgetBSplinePoints.h
PartSet_ExternalPointsMgr.h
PartSet_ExternalPointsMgr.h
+ PartSet_BSplineWidget.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
@@
-109,8
+113,10
@@
SET(PROJECT_SOURCES
PartSet_WidgetSketchLabel.cpp
PartSet_CenterPrs.cpp
PartSet_ExternalPointsMgr.cpp
PartSet_WidgetSketchLabel.cpp
PartSet_CenterPrs.cpp
PartSet_ExternalPointsMgr.cpp
- PartSet_TreeNodes.cpp
- PartSet_FieldStepPrs.cpp
+ PartSet_TreeNodes.cpp
+ PartSet_FieldStepPrs.cpp
+ PartSet_WidgetBSplinePoints.cpp
+ PartSet_BSplineWidget.cpp
)
SET(PROJECT_RESOURCES
)
SET(PROJECT_RESOURCES
@@
-125,11
+131,14
@@
SET(PROJECT_LIBRARIES
ModuleBase
ModelGeomAlgo
Config
ModuleBase
ModelGeomAlgo
Config
+ Locale
GeomAPI
GeomDataAPI
SketcherPrs
${QT_LIBRARIES}
${OpenCASCADE_FoundationClasses_LIBRARIES}
GeomAPI
GeomDataAPI
SketcherPrs
${QT_LIBRARIES}
${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_ApplicationFramework_LIBRARIES}
+ ${OCCViewer}
)
# sources / moc wrappings
)
# sources / moc wrappings
@@
-139,24
+148,25
@@
QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS})
QT_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
IF (${UPDATE_TRANSLATION})
QT_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
IF (${UPDATE_TRANSLATION})
- SET(PROJECT_FILES ${PROJECT_SOURCES} ${ROJECT_HEADERS} )
+ SET(PROJECT_FILES ${PROJECT_SOURCES} ${
P
ROJECT_HEADERS} )
QT5_CREATE_TRANSLATION(QM_RESOURCES
${PROJECT_FILES}
${TEXT_RESOURCES}
QT5_CREATE_TRANSLATION(QM_RESOURCES
${PROJECT_FILES}
${TEXT_RESOURCES}
- OPTIONS -extensions cpp -no-recursive
+ OPTIONS -extensions cpp -no-recursive
-locations none
)
ELSE(${UPDATE_TRANSLATION})
)
ELSE(${UPDATE_TRANSLATION})
- QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+ IF(${MAKE_TRANSLATION})
+ QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+ ENDIF(${MAKE_TRANSLATION})
ENDIF(${UPDATE_TRANSLATION})
SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
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 ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
-#SOURCE_GROUP ("Resource Files" FILES ${PROJECT_RESOURCES})
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
${PROJECT_SOURCE_DIR}/src/Config
${PROJECT_SOURCE_DIR}/src/Events
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
${PROJECT_SOURCE_DIR}/src/Config
${PROJECT_SOURCE_DIR}/src/Events
+ ${PROJECT_SOURCE_DIR}/src/Locale
${PROJECT_SOURCE_DIR}/src/ModuleBase
${PROJECT_SOURCE_DIR}/src/ModelAPI
${PROJECT_SOURCE_DIR}/src/ModelGeomAlgo
${PROJECT_SOURCE_DIR}/src/ModuleBase
${PROJECT_SOURCE_DIR}/src/ModelAPI
${PROJECT_SOURCE_DIR}/src/ModelGeomAlgo
@@
-173,12
+183,9
@@
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
${SUIT_INCLUDE}
)
${SUIT_INCLUDE}
)
-IF(${HAVE_SALOME})
- INCLUDE_DIRECTORIES(${SALOME_KERNEL_INCLUDE})
-ELSE(${HAVE_SALOME})
+IF(NOT ${HAVE_SALOME})
INCLUDE_DIRECTORIES(${APPELEMENTS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${APPELEMENTS_INCLUDE_DIR})
-ENDIF(${HAVE_SALOME})
-
+ENDIF()
ADD_DEFINITIONS(-DPARTSET_EXPORTS ${OpenCASCADE_DEFINITIONS})
ADD_LIBRARY(PartSet SHARED
ADD_DEFINITIONS(-DPARTSET_EXPORTS ${OpenCASCADE_DEFINITIONS})
ADD_LIBRARY(PartSet SHARED