Skip to content
Snippets Groups Projects
Commit 174fd120 authored by Nicolas Marsic's avatar Nicolas Marsic
Browse files

Improving CMakeLists.txt:

1/ allow to select version for python wrappers in normal mode
2/ install Numeric/pointsGenerators.h for small_fem
parent 2df9acc4
Branches
Tags
No related merge requests found
...@@ -110,7 +110,7 @@ set(GMSH_API ...@@ -110,7 +110,7 @@ set(GMSH_API
Common/onelab.h Common/GmshSocket.h Common/onelabUtils.h Common/Options.h Common/onelab.h Common/GmshSocket.h Common/onelabUtils.h Common/Options.h
Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
Numeric/JacobianBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h Numeric/JacobianBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
Numeric/FuncSpaceData.h Numeric/FuncSpaceData.h Numeric/pointsGenerators.h
Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h
Numeric/BasisFactory.h Numeric/CondNumBasis.h Numeric/BasisFactory.h Numeric/CondNumBasis.h
Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h
...@@ -953,7 +953,7 @@ if(HAVE_SOLVER) ...@@ -953,7 +953,7 @@ if(HAVE_SOLVER)
else(PETSC_ARCH) else(PETSC_ARCH)
set(ENV_PETSC_ARCH $ENV{PETSC_ARCH}) set(ENV_PETSC_ARCH $ENV{PETSC_ARCH})
endif(PETSC_ARCH) endif(PETSC_ARCH)
set(PETSC_POSSIBLE_CONF_FILES set(PETSC_POSSIBLE_CONF_FILES
${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables
${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc-conf/petscvariables ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc-conf/petscvariables
${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc/conf/petscvariables) ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc/conf/petscvariables)
...@@ -1209,7 +1209,7 @@ endif(ENABLE_ZIPPER) ...@@ -1209,7 +1209,7 @@ endif(ENABLE_ZIPPER)
if(ENABLE_WRAP_PYTHON) if(ENABLE_WRAP_PYTHON)
find_package(SWIG) find_package(SWIG)
find_package(PythonLibs) find_package(PythonLibs)
find_package(PythonInterp ${PYTHONLIBS_VERSION_STRING} EXACT) find_package(PythonInterp)# ${PYTHONLIBS_VERSION_STRING} EXACT)
if(SWIG_FOUND AND PYTHONLIBS_FOUND) if(SWIG_FOUND AND PYTHONLIBS_FOUND)
message(STATUS "Found SWIG version " ${SWIG_VERSION}) message(STATUS "Found SWIG version " ${SWIG_VERSION})
string(SUBSTRING ${SWIG_VERSION} 0 1 SWIG_MAJOR_VERSION) string(SUBSTRING ${SWIG_VERSION} 0 1 SWIG_MAJOR_VERSION)
...@@ -1217,6 +1217,7 @@ if(ENABLE_WRAP_PYTHON) ...@@ -1217,6 +1217,7 @@ if(ENABLE_WRAP_PYTHON)
message(WARNING "Python bindings require SWIG >= 2: disabling Python") message(WARNING "Python bindings require SWIG >= 2: disabling Python")
else(SWIG_MAJOR_VERSION EQUAL 1) else(SWIG_MAJOR_VERSION EQUAL 1)
set_config_option(HAVE_PYTHON "Python") set_config_option(HAVE_PYTHON "Python")
mark_as_advanced(CLEAR PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
endif(SWIG_MAJOR_VERSION EQUAL 1) endif(SWIG_MAJOR_VERSION EQUAL 1)
endif(SWIG_FOUND AND PYTHONLIBS_FOUND) endif(SWIG_FOUND AND PYTHONLIBS_FOUND)
endif(ENABLE_WRAP_PYTHON) endif(ENABLE_WRAP_PYTHON)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment