X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModelAPI%2FCMakeLists.txt;h=9fde2d5abd040caf5bf8740c6f14e3fe4fe75a22;hb=5a82acff74697623112b76b67c0200945a3e9976;hp=15686873f4e7934061c05cb65914888e77cda1fb;hpb=c3ae28ba30027cc4a6a757ef623f40adaae96ead;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 15686873f..9fde2d5ab 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,4 +1,22 @@
-## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+## Copyright (C) 2014-2017  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
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+## See http:##www.salome-platform.org/ or
+## email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+##
 
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
@@ -12,35 +30,42 @@ SET(PROJECT_HEADERS
     ModelAPI_AttributeIntArray.h
     ModelAPI_AttributeDocRef.h
     ModelAPI_AttributeDouble.h
+    ModelAPI_AttributeDoubleArray.h
     ModelAPI_AttributeInteger.h
     ModelAPI_AttributeRefAttr.h
     ModelAPI_AttributeReference.h
+    ModelAPI_AttributeRefAttrList.h
     ModelAPI_AttributeRefList.h
     ModelAPI_AttributeSelection.h
     ModelAPI_AttributeSelectionList.h
     ModelAPI_AttributeString.h
+    ModelAPI_AttributeStringArray.h
+    ModelAPI_AttributeTables.h
     ModelAPI_AttributeValidator.h
     ModelAPI_BodyBuilder.h
     ModelAPI_CompositeFeature.h
     ModelAPI_Data.h
     ModelAPI_Document.h
+    ModelAPI_EventReentrantMessage.h
     ModelAPI_Events.h
     ModelAPI_Expression.h
     ModelAPI_Feature.h
     ModelAPI_FeatureValidator.h
+    ModelAPI_Folder.h
+    ModelAPI_IReentrant.h
     ModelAPI_Object.h
     ModelAPI_Plugin.h
     ModelAPI_Result.h
     ModelAPI_ResultBody.h
-    ModelAPI_ResultCompSolid.h
     ModelAPI_ResultConstruction.h
+    ModelAPI_ResultField.h
     ModelAPI_ResultGroup.h
     ModelAPI_ResultParameter.h
     ModelAPI_ResultPart.h
     ModelAPI_Session.h
     ModelAPI_Tools.h
     ModelAPI_Validator.h
-	ModelAPI_Entity.h
+    ModelAPI_Entity.h
 )
 
 SET(PROJECT_SOURCES
@@ -49,27 +74,34 @@ SET(PROJECT_SOURCES
     ModelAPI_AttributeIntArray.cpp
     ModelAPI_AttributeDocRef.cpp
     ModelAPI_AttributeDouble.cpp
+    ModelAPI_AttributeDoubleArray.cpp
     ModelAPI_AttributeInteger.cpp
     ModelAPI_AttributeRefAttr.cpp
     ModelAPI_AttributeReference.cpp
+    ModelAPI_AttributeRefAttrList.cpp
     ModelAPI_AttributeRefList.cpp
     ModelAPI_AttributeSelection.cpp
     ModelAPI_AttributeSelectionList.cpp
     ModelAPI_AttributeString.cpp
+    ModelAPI_AttributeStringArray.cpp
+    ModelAPI_AttributeTables.cpp
     ModelAPI_BodyBuilder.cpp
     ModelAPI_CompositeFeature.cpp
     ModelAPI_Data.cpp
     ModelAPI_Document.cpp
+    ModelAPI_EventReentrantMessage.cpp
     ModelAPI_Events.cpp
     ModelAPI_Expression.cpp
     ModelAPI_Feature.cpp
     ModelAPI_FeatureValidator.cpp
+    ModelAPI_Folder.cpp
+    ModelAPI_IReentrant.cpp
     ModelAPI_Object.cpp
     ModelAPI_Plugin.cpp
     ModelAPI_Result.cpp
     ModelAPI_ResultBody.cpp
-    ModelAPI_ResultCompSolid.cpp
     ModelAPI_ResultConstruction.cpp
+    ModelAPI_ResultField.cpp
     ModelAPI_ResultGroup.cpp
     ModelAPI_ResultPart.cpp
     ModelAPI_ResultParameter.cpp
@@ -80,6 +112,7 @@ SET(PROJECT_SOURCES
 
 SET(PROJECT_LIBRARIES
     Config
+    GeomAPI
 )
 SET(CMAKE_SWIG_FLAGS -threads -Wall)
 ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
@@ -88,7 +121,7 @@ ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX)
 TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES})
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config 
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config
                     ${PROJECT_SOURCE_DIR}/src/Events
                     ${PROJECT_SOURCE_DIR}/src/GeomAPI
                     ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
@@ -107,7 +140,7 @@ SET(SWIG_SCRIPTS
 
 SET(SWIG_LINK_LIBRARIES
   ModelAPI
-  GeomAPI 
+  GeomAPI
   ${PYTHON_LIBRARIES}
 )
 
@@ -118,11 +151,54 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(_ModelAPI PROPERTIES DEBUG_OUTPUT_NAME _ModelAPI_d)
 ENDIF(WIN32)
 
-INSTALL(TARGETS _ModelAPI DESTINATION swig)
-INSTALL(TARGETS ModelAPI DESTINATION bin)
-INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig)
+INSTALL(TARGETS _ModelAPI DESTINATION ${SHAPER_INSTALL_SWIG})
+INSTALL(TARGETS ModelAPI DESTINATION ${SHAPER_INSTALL_BIN})
+INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})
 
 ADD_UNIT_TESTS(TestConstants.py
                TestUndoRedo.py
                TestDocument.py
-               Test1064.py)
+               Test1064.py
+               TestResults.py
+               TestIntArray.py
+               Test1512.py
+               TestDoubleArray.py
+               Test1757.py
+               Test1998.py
+               Test1995.py
+               Test2170.py
+               TestExternalConstruction.py
+               Test2228.py
+               Test2241.py
+               Test2252.py
+               Test2276.py
+               Test2389.py
+               Test2391.py
+               TestCustomName_BooleanCut.py
+               TestCustomName_CommonCompSolid.py
+               TestCustomName_CutCompSolid.py
+               TestCustomName_CutGroup.py
+               TestCustomName_DefaultName.py
+               TestCustomName_ExtrudeFace.py
+               TestCustomName_ExtrusionCut.py
+               TestCustomName_ExtrusionCutFace.py
+               TestCustomName_MultiTranslation.py
+               TestCustomName_Partition.py
+               TestCustomName_Placement.py
+               TestCustomName_Recover.py
+               TestCustomName_Rename.py
+               TestCustomName_RotateGroup.py
+               TestCustomName_Translation.py
+               TestFolder_Create.py
+               TestFolder_Update.py
+               TestFolder_Remove.py
+               TestFolder_Stability.py
+               TestFolder_CustomName.py
+               Test2358_1.py
+               Test2358_2.py
+               Test2396.py
+               Test2401.py
+               Test2413.py
+               Test2496.py
+               Test2510.py
+)