Commit f53c7347 by Christophe Geuzaine

fix generation of python wrappers for deprecated internal API

parent a3817c89
Pipeline #744 failed with stage
in 212 minutes 3 seconds
......@@ -169,6 +169,11 @@ set(GMSH_DEPRECATED_API
contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
contrib/MathEx/mathex.h)
get_property(IAMCHILD DIRECTORY PROPERTY PARENT_DIRECTORY)
if(IAMCHILD)
set(GMSH_DEPRECATED_API ${GMSH_API} PARENT_SCOPE)
endif(IAMCHILD)
if(${CMAKE_MAJOR_VERSION} GREATER 2)
string(TIMESTAMP DATE "%Y%m%d")
else(${CMAKE_MAJOR_VERSION} GREATER 2)
......@@ -1271,7 +1276,6 @@ if(ENABLE_WRAP_PYTHON)
else(SWIG_MAJOR_VERSION EQUAL 1)
set_config_option(HAVE_PYTHON "Python")
mark_as_advanced(CLEAR PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
add_subdirectory(wrappers/gmshpy)
if(ENABLE_NUMPY)
if (NOT NUMPY_INC)
EXEC_PROGRAM (${PYTHON_EXECUTABLE}
......@@ -1303,13 +1307,6 @@ if(ENABLE_WRAP_PYTHON)
endif(SWIG_FOUND AND PYTHONLIBS_FOUND)
endif(ENABLE_WRAP_PYTHON)
if(ENABLE_WRAP_JAVA AND ENABLE_DEPRECATED_API)
if(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
message(WARNING "Java wrapping samples will not work without BLAS and LAPACK")
endif(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
add_subdirectory(wrappers/java)
endif(ENABLE_WRAP_JAVA AND ENABLE_DEPRECATED_API)
check_function_exists(vsnprintf HAVE_VSNPRINTF)
if(NOT HAVE_VSNPRINTF AND NOT ENABLE_BUILD_IOS AND NOT ENABLE_BUILD_ANDROID)
set_config_option(HAVE_NO_VSNPRINTF "NoVsnprintf")
......@@ -1937,6 +1934,14 @@ else(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
set(CPACK_GENERATOR TGZ)
endif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
if(HAVE_PYTHON AND ENABLE_DEPRECATED_API)
add_subdirectory(wrappers/gmshpy)
endif(HAVE_PYTHON AND ENABLE_DEPRECATED_API)
if(ENABLE_WRAP_JAVA AND ENABLE_DEPRECATED_API)
add_subdirectory(wrappers/java)
endif(ENABLE_WRAP_JAVA AND ENABLE_DEPRECATED_API)
include(CPack)
if(NOT DISABLE_GMSH_TESTS)
......
......@@ -116,7 +116,7 @@ if (NOT ENABLE_GMSHPY_SOURCE_PACKAGE)
endif (NOT ENABLE_GMSHPY_SOURCE_PACKAGE)
if(ENABLE_GMSHPY_SOURCE_PACKAGE)
set(GMSH_API ${GMSH_API} Geo/Curvature.h Mesh/Generator.h
set(GMSH_DEPRECATED_API ${GMSH_DEPRECATED_API} Geo/Curvature.h Mesh/Generator.h
Mesh/meshGFaceLloyd.h Numeric/DivideAndConquer.h Post/PViewFactory.h
Solver/linearSystemPETSc.h Fltk/FlGui.h Solver/functionSpace.h
Solver/STensor43.h Solver/sparsityPattern.h Solver/SElement.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment