Fix problem for not locatable points in the context of NodeFE spatial discr

[tools/medcoupling.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f737d16e629c46bb3dae9910f5b47eef9101005d..aae5bce0ce4e9b854136effa170f4244f1c1dfdc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  CEA/DEN, EDF R&D
+# Copyright (C) 2015-2022  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
@@ -49,7 +49,7 @@ ENDIF()
 
 # Versioning
 # ===========
-SALOME_SETUP_VERSION(9.8.0)
+SALOME_SETUP_VERSION(9.9.0 DEVELOPMENT)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Platform setup
@@ -90,8 +90,9 @@ OPTION(MEDCOUPLING_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
 OPTION(MEDCOUPLING_ENABLE_RENUMBER "Build Renumber." ON)
 OPTION(MEDCOUPLING_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
 OPTION(MEDCOUPLING_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." OFF)
-OPTION(MEDCOUPLING_BUILD_TESTS "Build MED tests." ON)
-OPTION(MEDCOUPLING_BUILD_DOC "Build MED doc." ON)
+OPTION(MEDCOUPLING_BUILD_TESTS "Build MEDCoupling C++ tests." ON)
+OPTION(MEDCOUPLING_BUILD_PY_TESTS "Build MEDCoupling Python tests." ON)
+OPTION(MEDCOUPLING_BUILD_DOC "Build MEDCoupling doc." ON)
 OPTION(MEDCOUPLING_BUILD_STATIC "Build MEDCoupling library in static mode." OFF)
 OPTION(MEDCOUPLING_USE_64BIT_IDS "Size of IDs to refer cells and nodes. 32 bits when OFF (default), 64 bits when ON." ON)
 
@@ -211,6 +212,14 @@ IF(MEDCOUPLING_ENABLE_PYTHON)
   IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3")
       MESSAGE(STATUS "Using Python 3")
   ENDIF()
+  IF ("${SWIG_VERSION}" VERSION_GREATER_EQUAL "4")
+    SET(MEDCOUPLING_SWIG4_COMPAT TRUE CACHE BOOL "SWIG 4 compatibility (experimental)")
+  ELSE()
+    SET(MEDCOUPLING_SWIG4_COMPAT FALSE)
+  ENDIF()
+  IF(MEDCOUPLING_SWIG4_COMPAT)
+    LIST(APPEND CMAKE_SWIG_FLAGS "-DMEDCOUPLING_SWIG4_COMPAT")
+  ENDIF()
 ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 IF(MEDCOUPLING_BUILD_DOC)
@@ -275,7 +284,7 @@ IF(WIN32)
   ADD_DEFINITIONS("-D_USE_MATH_DEFINES")
 ENDIF(WIN32)
 
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(adm_local)