X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesAPI%2FCMakeLists.txt;h=881c8bdf26f30ce945414adac858fd2a44437f34;hb=8c0c4ee7412fe13fdffca96d5f56d0fb06ac2543;hp=1db8f2dd69765e6b3b03ad9ee6bb28c9ef633c1b;hpb=0cf033e3d2d9a6419aac40d77cd200187562a159;p=modules%2Fshaper.git diff --git a/src/FeaturesAPI/CMakeLists.txt b/src/FeaturesAPI/CMakeLists.txt index 1db8f2dd6..881c8bdf2 100644 --- a/src/FeaturesAPI/CMakeLists.txt +++ b/src/FeaturesAPI/CMakeLists.txt @@ -1,4 +1,4 @@ -## Copyright (C) 2014-20xx CEA/DEN, EDF R&D +## Copyright (C) 2014-2016 CEA/DEN, EDF R&D INCLUDE(Common) @@ -7,8 +7,9 @@ SET(PROJECT_HEADERS FeaturesAPI_Boolean.h FeaturesAPI_Extrusion.h FeaturesAPI_ExtrusionBoolean.h - FeaturesAPI_Group.h FeaturesAPI_Intersection.h + FeaturesAPI_MultiRotation.h + FeaturesAPI_MultiTranslation.h FeaturesAPI_Partition.h FeaturesAPI_Pipe.h FeaturesAPI_Placement.h @@ -17,15 +18,19 @@ SET(PROJECT_HEADERS FeaturesAPI_Revolution.h FeaturesAPI_RevolutionBoolean.h FeaturesAPI_Rotation.h + FeaturesAPI_Scale.h + FeaturesAPI_Symmetry.h FeaturesAPI_Translation.h + FeaturesAPI_Union.h ) SET(PROJECT_SOURCES FeaturesAPI_Boolean.cpp FeaturesAPI_Extrusion.cpp FeaturesAPI_ExtrusionBoolean.cpp - FeaturesAPI_Group.cpp FeaturesAPI_Intersection.cpp + FeaturesAPI_MultiRotation.cpp + FeaturesAPI_MultiTranslation.cpp FeaturesAPI_Partition.cpp FeaturesAPI_Pipe.cpp FeaturesAPI_Placement.cpp @@ -34,7 +39,10 @@ SET(PROJECT_SOURCES FeaturesAPI_Revolution.cpp FeaturesAPI_RevolutionBoolean.cpp FeaturesAPI_Rotation.cpp + FeaturesAPI_Scale.cpp + FeaturesAPI_Symmetry.cpp FeaturesAPI_Translation.cpp + FeaturesAPI_Union.cpp ) SET(PROJECT_LIBRARIES @@ -56,8 +64,7 @@ INCLUDE_DIRECTORIES( ${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}) @@ -68,7 +75,6 @@ INCLUDE(PythonAPI) 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 @@ -92,11 +98,3 @@ ENDIF(WIN32) 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}) - -# Tests -INCLUDE(UnitTest) - -ADD_UNIT_TESTS( -) - -# ADD_SUBDIRECTORY (Test)