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' into cgt/devCEA
[modules/shaper.git]
/
src
/
FeaturesAPI
/
CMakeLists.txt
diff --git
a/src/FeaturesAPI/CMakeLists.txt
b/src/FeaturesAPI/CMakeLists.txt
index 1db8f2dd69765e6b3b03ad9ee6bb28c9ef633c1b..e109499003f091b13e5d938c0baec7ba82d6e6c5 100644
(file)
--- a/
src/FeaturesAPI/CMakeLists.txt
+++ b/
src/FeaturesAPI/CMakeLists.txt
@@
-1,13
+1,13
@@
-## Copyright (C) 2014-20
xx
CEA/DEN, EDF R&D
+## Copyright (C) 2014-20
16
CEA/DEN, EDF R&D
INCLUDE(Common)
INCLUDE(Common)
+INCLUDE(UnitTest)
SET(PROJECT_HEADERS
FeaturesAPI.h
FeaturesAPI_Boolean.h
FeaturesAPI_Extrusion.h
FeaturesAPI_ExtrusionBoolean.h
SET(PROJECT_HEADERS
FeaturesAPI.h
FeaturesAPI_Boolean.h
FeaturesAPI_Extrusion.h
FeaturesAPI_ExtrusionBoolean.h
- FeaturesAPI_Group.h
FeaturesAPI_Intersection.h
FeaturesAPI_Partition.h
FeaturesAPI_Pipe.h
FeaturesAPI_Intersection.h
FeaturesAPI_Partition.h
FeaturesAPI_Pipe.h
@@
-17,14
+17,15
@@
SET(PROJECT_HEADERS
FeaturesAPI_Revolution.h
FeaturesAPI_RevolutionBoolean.h
FeaturesAPI_Rotation.h
FeaturesAPI_Revolution.h
FeaturesAPI_RevolutionBoolean.h
FeaturesAPI_Rotation.h
+ FeaturesAPI_Symmetry.h
FeaturesAPI_Translation.h
FeaturesAPI_Translation.h
+ FeaturesAPI_Union.h
)
SET(PROJECT_SOURCES
FeaturesAPI_Boolean.cpp
FeaturesAPI_Extrusion.cpp
FeaturesAPI_ExtrusionBoolean.cpp
)
SET(PROJECT_SOURCES
FeaturesAPI_Boolean.cpp
FeaturesAPI_Extrusion.cpp
FeaturesAPI_ExtrusionBoolean.cpp
- FeaturesAPI_Group.cpp
FeaturesAPI_Intersection.cpp
FeaturesAPI_Partition.cpp
FeaturesAPI_Pipe.cpp
FeaturesAPI_Intersection.cpp
FeaturesAPI_Partition.cpp
FeaturesAPI_Pipe.cpp
@@
-34,7
+35,9
@@
SET(PROJECT_SOURCES
FeaturesAPI_Revolution.cpp
FeaturesAPI_RevolutionBoolean.cpp
FeaturesAPI_Rotation.cpp
FeaturesAPI_Revolution.cpp
FeaturesAPI_RevolutionBoolean.cpp
FeaturesAPI_Rotation.cpp
+ FeaturesAPI_Symmetry.cpp
FeaturesAPI_Translation.cpp
FeaturesAPI_Translation.cpp
+ FeaturesAPI_Union.cpp
)
SET(PROJECT_LIBRARIES
)
SET(PROJECT_LIBRARIES
@@
-56,8
+59,7
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/FeaturesPlugin
)
${PROJECT_SOURCE_DIR}/src/FeaturesPlugin
)
-#TODO(spo): is ${CAS_DEFINITIONS} necessary?
-ADD_DEFINITIONS(-DFEATURESAPI_EXPORTS ${CAS_DEFINITIONS})
+ADD_DEFINITIONS(-DFEATURESAPI_EXPORTS)
ADD_LIBRARY(FeaturesAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
TARGET_LINK_LIBRARIES(FeaturesAPI ${PROJECT_LIBRARIES})
ADD_LIBRARY(FeaturesAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
TARGET_LINK_LIBRARIES(FeaturesAPI ${PROJECT_LIBRARIES})
@@
-68,7
+70,6
@@
INCLUDE(PythonAPI)
SET_SOURCE_FILES_PROPERTIES(FeaturesAPI.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(FeaturesAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
SET_SOURCE_FILES_PROPERTIES(FeaturesAPI.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(FeaturesAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
-#TODO(spo): is ModelAPI necessary or it could be received by INTERFACE_ (may require modern CMake)?
SET(SWIG_LINK_LIBRARIES
FeaturesAPI
ModelHighAPI
SET(SWIG_LINK_LIBRARIES
FeaturesAPI
ModelHighAPI
@@
-93,10
+94,5
@@
INSTALL(TARGETS _FeaturesAPI DESTINATION ${SHAPER_INSTALL_SWIG})
INSTALL(TARGETS FeaturesAPI DESTINATION ${SHAPER_INSTALL_BIN})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/FeaturesAPI.py DESTINATION ${SHAPER_INSTALL_SWIG})
INSTALL(TARGETS FeaturesAPI DESTINATION ${SHAPER_INSTALL_BIN})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/FeaturesAPI.py DESTINATION ${SHAPER_INSTALL_SWIG})
-# Tests
-INCLUDE(UnitTest)
-
-ADD_UNIT_TESTS(
-)
-
-# ADD_SUBDIRECTORY (Test)
+ADD_UNIT_TESTS(APIParam_Symmetry.py
+ APIParam_Translation.py)
\ No newline at end of file