follow modifs in gmsh

NonLinearSolver/CMakeLists.txt

@@ -91,10 +91,10 @@ materialLaw Domain BoundaryConditions nlTerms field space periodicBC restart nlm
 ${CMAKE_CURRENT_BINARY_DIR} $ENV{NLSMPIINC})
 
 # To have the possibility to use python function in the code
-if(ENABLE_WRAP_PYTHON)
+if(ENABLE_WRAP_PYTHON_DEPRECATED)
   include_directories(${PYTHON_INCLUDE_DIR})
   add_definitions(-DNLS_WITH_PYTHON)
-endif(ENABLE_WRAP_PYTHON)
+endif(ENABLE_WRAP_PYTHON_DEPRECATED)
 
 file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 

dG3D/CMakeLists.txt

@@ -72,7 +72,7 @@ else()
   target_link_libraries(dG3D ${EXTERNAL_LIBRARIES} shared nlsolver)
 endif(INDEBUG AND NOT CM3APPS)
 
-if(ENABLE_WRAP_PYTHON)
+if(ENABLE_WRAP_PYTHON_DEPRECATED)
   find_package(SWIG REQUIRED)
   include(${SWIG_USE_FILE})
   find_package(PythonLibs)
@@ -88,5 +88,5 @@ if(ENABLE_WRAP_PYTHON)
     swig_link_libraries(${LIBDG3DNAME} ${PYTHON_LIBRARIES} dG3D)
   endif(INDEBUG AND NOT CM3APPS)
   add_custom_command(TARGET _${LIBDG3DNAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/dG3DpyPYTHON_wrap.cxx)
-endif(ENABLE_WRAP_PYTHON)
+endif(ENABLE_WRAP_PYTHON_DEPRECATED)
 

dgshell/CMakeLists.txt

@@ -75,7 +75,7 @@ endif(INDEBUG AND NOT CM3APPS)
 #  set_target_properties(dgshared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
 #endif(HAVE_LAPACK AND LAPACK_FLAGS)
 
-if(ENABLE_WRAP_PYTHON)
+if(ENABLE_WRAP_PYTHON_DEPRECATED)
   find_package(SWIG REQUIRED)
   include(${SWIG_USE_FILE})
  
@@ -91,5 +91,5 @@ if(ENABLE_WRAP_PYTHON)
     swig_link_libraries(${LIBDGSHELLNAME} ${PYTHON_LIBRARIES} dgshell)
   endif(INDEBUG AND NOT CM3APPS)
   add_custom_command(TARGET _${LIBDGSHELLNAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/dgshellpyPYTHON_wrap.cxx)
-endif(ENABLE_WRAP_PYTHON)
+endif(ENABLE_WRAP_PYTHON_DEPRECATED)