X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FCMakeLists.txt;h=4b3c816daaf11e37c831e3c8fdd5a24cef7f11d4;hb=a211165b993cec59888b300199b44b525c0daf69;hp=8e191e4fd53c93614ce1faf0e1a2025ce9b259a6;hpb=5c59bf6725e7e4855b5ca956475d705e2d5b014c;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt
index 8e191e4fd..4b3c816da 100644
--- a/src/GeomAPI/CMakeLists.txt
+++ b/src/GeomAPI/CMakeLists.txt
@@ -1,30 +1,32 @@
-## 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>
-##
+# Copyright (C) 2014-2019  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
+#
 
 FIND_PACKAGE(SWIG REQUIRED)
 
 INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE(UnitTest)
 
 SET(PROJECT_HEADERS
     GeomAPI.h
+    GeomAPI_BSpline.h
+    GeomAPI_BSpline2d.h
     GeomAPI_Circ.h
     GeomAPI_Circ2d.h
     GeomAPI_Interface.h
@@ -55,10 +57,25 @@ SET(PROJECT_HEADERS
     GeomAPI_Ax3.h
     GeomAPI_Trsf.h
     GeomAPI_Angle2d.h
+    GeomAPI_Angle.h
     GeomAPI_Wire.h
+    GeomAPI_Ellipse.h
+    GeomAPI_Ellipse2d.h
+    GeomAPI_Tools.h
+    GeomAPI_Shell.h
+    GeomAPI_Solid.h
+    GeomAPI_Sphere.h
+    GeomAPI_Cylinder.h
+    GeomAPI_Cone.h
+    GeomAPI_Torus.h
+    GeomAPI_Box.h
+    GeomAPI_WireExplorer.h
+    GeomAPI_ShapeHierarchy.h
 )
 
 SET(PROJECT_SOURCES
+    GeomAPI_BSpline.cpp
+    GeomAPI_BSpline2d.cpp
     GeomAPI_Circ.cpp
     GeomAPI_Circ2d.cpp
     GeomAPI_Interface.cpp
@@ -89,28 +106,38 @@ SET(PROJECT_SOURCES
     GeomAPI_IPresentable.cpp
     GeomAPI_Trsf.cpp
     GeomAPI_Angle2d.cpp
+    GeomAPI_Angle.cpp
     GeomAPI_Wire.cpp
+    GeomAPI_Ellipse.cpp
+    GeomAPI_Ellipse2d.cpp
+    GeomAPI_Tools.cpp
+    GeomAPI_Shell.cpp
+    GeomAPI_Solid.cpp
+    GeomAPI_Sphere.cpp
+    GeomAPI_Cylinder.cpp
+    GeomAPI_Cone.cpp
+    GeomAPI_Torus.cpp
+    GeomAPI_Box.cpp
+    GeomAPI_WireExplorer.cpp
+    GeomAPI_ShapeHierarchy.cpp
 )
 
 SET(PROJECT_LIBRARIES
-    ${CAS_KERNEL}
-    ${CAS_MODELER}
-    ${CAS_VIEWER}
-    ${CAS_SHAPE}
-    ${CAS_TKTopAlgo}
-    ${CAS_TKBO}
+    ${OpenCASCADE_FoundationClasses_LIBRARIES}
+    ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+    ${OpenCASCADE_Visualization_LIBRARIES}
 )
 
-ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${CAS_DEFINITIONS})
+ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${OpenCASCADE_DEFINITIONS})
 ADD_LIBRARY(GeomAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 
-SET(CMAKE_SWIG_FLAGS -threads -Wall)
+SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,512)
 
 SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES})
@@ -124,7 +151,11 @@ SET(SWIG_LINK_LIBRARIES
   ${PYTHON_LIBRARIES}
 )
 
-SWIG_ADD_MODULE(GeomAPI python GeomAPI.i ${PROJECT_HEADERS})
+IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0")
+  SWIG_ADD_LIBRARY(GeomAPI LANGUAGE python SOURCES GeomAPI.i ${PROJECT_HEADERS})
+ELSE()
+  SWIG_ADD_MODULE(GeomAPI python GeomAPI.i ${PROJECT_HEADERS})
+ENDIF()
 SWIG_LINK_LIBRARIES(GeomAPI ${SWIG_LINK_LIBRARIES})
 
 IF(WIN32)
@@ -134,3 +165,19 @@ ENDIF(WIN32)
 INSTALL(TARGETS _GeomAPI DESTINATION ${SHAPER_INSTALL_SWIG})
 INSTALL(TARGETS GeomAPI DESTINATION ${SHAPER_INSTALL_BIN})
 INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})
+
+ADD_UNIT_TESTS(
+  TestAx123.py
+  TestBox.py
+  TestBuilders.py
+  TestCone.py
+  TestCylinder.py
+  TestEllipse2d.py
+  TestLine.py
+  TestPlanarEdge.py
+  TestPolygon.py
+  TestSphere.py
+  TestTorus.py
+  Test2675.py
+  Test2879.py
+)