X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConnectorAPI%2FCMakeLists.txt;h=188969238fbae9bc0bbc97d7d88c98a8950e7e5e;hb=9cbb80b828e3dfd3dbd716072222b32bdcc96815;hp=67c29091a713dae4df895b1b29294a669a3980e3;hpb=7074394f8f08413d885f63be01df6bd5007b868c;p=modules%2Fshaper.git

diff --git a/src/ConnectorAPI/CMakeLists.txt b/src/ConnectorAPI/CMakeLists.txt
index 67c29091a..188969238 100644
--- a/src/ConnectorAPI/CMakeLists.txt
+++ b/src/ConnectorAPI/CMakeLists.txt
@@ -49,8 +49,8 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/ConnectorPlugin
 )
 
-#TODO(spo): is ${CAS_DEFINITIONS} necessary?
-ADD_DEFINITIONS(-DCONNECTORAPI_EXPORTS ${CAS_DEFINITIONS})
+#TODO(spo): is ${OpenCASCADE_DEFINITIONS} necessary?
+ADD_DEFINITIONS(-DCONNECTORAPI_EXPORTS ${OpenCASCADE_DEFINITIONS})
 ADD_LIBRARY(ConnectorAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 TARGET_LINK_LIBRARIES(ConnectorAPI ${PROJECT_LIBRARIES})
 
@@ -75,7 +75,11 @@ SET(SWIG_MODULE_ConnectorAPI_EXTRA_DEPS ${SWIG_MODULE_ConnectorAPI_EXTRA_DEPS}
   ${PROJECT_HEADERS}
 )
 
-SWIG_ADD_MODULE(ConnectorAPI python ConnectorAPI.i ${PROJECT_HEADERS})
+IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0")
+  SWIG_ADD_LIBRARY(ConnectorAPI LANGUAGE python SOURCES ConnectorAPI.i ${PROJECT_HEADERS})
+ELSE()
+  SWIG_ADD_MODULE(ConnectorAPI python ConnectorAPI.i ${PROJECT_HEADERS})
+ENDIF()
 SWIG_LINK_LIBRARIES(ConnectorAPI ${SWIG_LINK_LIBRARIES})
 
 IF(WIN32)
@@ -88,9 +92,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ConnectorAPI.py DESTINATION ${SHAPER_I
 
 # Tests
 IF(${HAVE_SALOME})
-  INCLUDE(UnitTest)
-
-  ADD_UNIT_TESTS(
-    TestExportToGEOM.py
-  )
+  ENABLE_TESTING()
+  ADD_SUBDIRECTORY(Test)
 ENDIF(${HAVE_SALOME})