]> SALOME platform Git repositories - tools/solverlab.git/commitdiff
Salome HOME
Corrected error in yesterday commit
authormichael <michael@localhost.localdomain>
Thu, 21 Jan 2021 13:13:46 +0000 (14:13 +0100)
committermichael <michael@localhost.localdomain>
Thu, 21 Jan 2021 13:13:46 +0000 (14:13 +0100)
CDMATH/swig/CMakeLists.txt
CoreFlows/swig/CMakeLists.txt

index 174ad7bfecc5d4ed970da1984d4bdb8366c805eb..924fe3dcdbb4482c4405b531f0652efdd5e9a8f2 100755 (executable)
@@ -35,9 +35,9 @@ IF   (${CMAKE_VERSION} VERSION_GREATER "3.13.0")
 ENDIF(${CMAKE_VERSION} VERSION_GREATER "3.13.0")
 
 IF   (${CMAKE_VERSION} VERSION_LESS "3.8.0") 
-  SWIG_ADD_LIBRARY(cdmath TYPE SHARED LANGUAGE python SOURCES ${CMAKE_CURRENT_BINARY_DIR}/cdmath.i)
-ELSE (${CMAKE_VERSION} VERSION_LESS "3.8.0") 
   SWIG_ADD_MODULE(cdmath python ${CMAKE_CURRENT_BINARY_DIR}/cdmath.i)
+ELSE (${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+  SWIG_ADD_LIBRARY(cdmath TYPE SHARED LANGUAGE python SOURCES ${CMAKE_CURRENT_BINARY_DIR}/cdmath.i)
 ENDIF(${CMAKE_VERSION} VERSION_LESS "3.8.0")
  
 SWIG_LINK_LIBRARIES(cdmath ${Python_LIBRARIES} base mesh ${medloader} ${medcoupling} ${_extra_lib_SWIG})
index d97f8491a58e264bf97139b41fb0548c6e125ab4..9302ecac7abebbfaea6075cf1ce83089b85e5f23 100755 (executable)
@@ -14,9 +14,9 @@ INCLUDE_DIRECTORIES(
 SET(_extra_lib_SWIG ${CDMATH_LIBRARIES} ${PETSC_LIBRARIES} ${SLEPC_LIBRARIES})   
 
 IF   (${CMAKE_VERSION} VERSION_LESS "3.8.0") 
-  SWIG_ADD_LIBRARY(CoreFlows TYPE SHARED LANGUAGE python SOURCES CoreFlows.i)
-ELSE (${CMAKE_VERSION} VERSION_LESS "3.8.0") 
   SWIG_ADD_MODULE(CoreFlows python CoreFlows.i)
+ELSE (${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+  SWIG_ADD_LIBRARY(CoreFlows TYPE SHARED LANGUAGE python SOURCES CoreFlows.i)
 ENDIF(${CMAKE_VERSION} VERSION_LESS "3.8.0")
 
 SWIG_LINK_LIBRARIES(CoreFlows ${Python_LIBRARIES} ${_extra_lib_SWIG} CoreFlowsLibs ${PETSC_LIBRARIES} ${SLEPC_LIBRARIES})