X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGDMLAPI%2FCMakeLists.txt;h=bfd90c8b77c61e4ca129173c6eec1d313b9b5c80;hb=627bd194613dfc2a237720c962f33c56d331766f;hp=9084ba827ef1dddc2fc2aaf804e7e4aeda390b3e;hpb=5b6031b015602aa07f5a6fc668c13ac3faf7a8a9;p=modules%2Fshaper.git

diff --git a/src/GDMLAPI/CMakeLists.txt b/src/GDMLAPI/CMakeLists.txt
index 9084ba827..bfd90c8b7 100644
--- a/src/GDMLAPI/CMakeLists.txt
+++ b/src/GDMLAPI/CMakeLists.txt
@@ -1,15 +1,33 @@
-## Copyright (C) 2014-2016 CEA/DEN, EDF R&D
+# 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
+#
 
 INCLUDE(Common)
-INCLUDE(UnitTest)
 
 SET(PROJECT_HEADERS
   GDMLAPI.h
   GDMLAPI_ConeSegment.h
+  GDMLAPI_Ellipsoid.h
 )
 
 SET(PROJECT_SOURCES
   GDMLAPI_ConeSegment.cpp
+  GDMLAPI_Ellipsoid.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -31,7 +49,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/GDMLPlugin
 )
 
-ADD_DEFINITIONS(-DGDMLAPI_EXPORTS ${CAS_DEFINITIONS})
+ADD_DEFINITIONS(-DGDMLAPI_EXPORTS ${OpenCASCADE_DEFINITIONS})
 ADD_LIBRARY(GDMLAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 TARGET_LINK_LIBRARIES(GDMLAPI ${PROJECT_LIBRARIES})
 
@@ -48,6 +66,7 @@ SET(SWIG_LINK_LIBRARIES
   ModelAPI
   ${PYTHON_LIBRARIES}
 )
+SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403)
 
 SET(SWIG_MODULE_GDMLAPI_EXTRA_DEPS ${SWIG_MODULE_GDMLAPI_EXTRA_DEPS}
   ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i
@@ -55,7 +74,11 @@ SET(SWIG_MODULE_GDMLAPI_EXTRA_DEPS ${SWIG_MODULE_GDMLAPI_EXTRA_DEPS}
   ${PROJECT_HEADERS}
 )
 
-SWIG_ADD_MODULE(GDMLAPI python GDMLAPI.i ${PROJECT_HEADERS})
+IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0")
+  SWIG_ADD_LIBRARY(GDMLAPI LANGUAGE python SOURCES GDMLAPI.i ${PROJECT_HEADERS})
+ELSE()
+  SWIG_ADD_MODULE(GDMLAPI python GDMLAPI.i ${PROJECT_HEADERS})
+ENDIF()
 SWIG_LINK_LIBRARIES(GDMLAPI ${SWIG_LINK_LIBRARIES})
 
 IF(WIN32)
@@ -65,6 +88,3 @@ ENDIF(WIN32)
 INSTALL(TARGETS _GDMLAPI DESTINATION ${SHAPER_INSTALL_SWIG})
 INSTALL(TARGETS GDMLAPI DESTINATION ${SHAPER_INSTALL_BIN})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/GDMLAPI.py DESTINATION ${SHAPER_INSTALL_SWIG})
-
-# Tests
-ADD_UNIT_TESTS(TestConeSegment.py)
\ No newline at end of file