wip

Author: thelfer

CMakeLists.txt

@@ -36,8 +36,13 @@ endif(enable-fortran-bindings)
 
 #python bindings
 option(enable-python-bindings "enable  python bindings support" OFF)
-option(enable-broken-boost-python-module-visibility-handling
-  "workaround a bug in boost python which occurs on FreeBSD+clang. See https://github.com/boostorg/python/issues/173 for details" OFF)
+option(enable-pybind11 "using pybind11 to make the python bindings (otherwise, boost/python is used)" OFF)
+
+if(enable-pybind11)
+  if(NOT enable-python-bindings)
+    message(FATAL_ERROR "the option enable-pybind11 is only meaningful if the python bindings are enabled")
+  endif(NOT enable-python-bindings)
+endif(enable-pybind11)
 
 if(enable-python-bindings)
   find_package(Python REQUIRED COMPONENTS Interpreter Development NumPy)
@@ -55,86 +60,12 @@ if(enable-python-bindings)
   if(NOT HAVE_PYTHON)
     message(FATAL_ERROR "python not found. python is mandatory for python bindings.")
   endif(NOT HAVE_PYTHON)
-  # numpy detection
-  execute_process(
-    COMMAND "${PYTHON_EXECUTABLE}" -c
-            "from __future__ import print_function\ntry: import numpy; print(numpy.get_include(), end='')\nexcept:pass\n"
-            OUTPUT_VARIABLE NUMPY_INCLUDE_PATH)
-  find_path(PYTHON_NUMPY_INCLUDE_DIR numpy/arrayobject.h
-    HINTS "${NUMPY_INCLUDE_PATH}" "${PYTHON_INCLUDE_PATH}" NO_DEFAULT_PATH)
-  if(NOT PYTHON_NUMPY_INCLUDE_DIR)
-    message(FATAL_ERROR "numpy not found. numpy is mandatory for python bindings.")
-  endif(NOT PYTHON_NUMPY_INCLUDE_DIR)
-  # boost python detection
-  message(STATUS "Trying to find libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-  # Fix a bug in FindBoost 1.70
-  # https://github.com/boostorg/boost_install/issues/5
-  if(NOT DEFINED BUILD_SHARED_LIBS)
-    set(MGIS_TMP_BUILD_SHARED_LIBS ON)
-    set(BUILD_SHARED_LIBS ON)
-  endif(NOT DEFINED BUILD_SHARED_LIBS)
-  find_package(Boost 1.36.0 COMPONENTS
-               "python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-  if(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
-    set(Boost_PYTHON_FOUND ON)
-    set(Boost_PYTHON_LIBRARY "${Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}")
-  else(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
-    set(Boost_PYTHON_FOUND OFF)
-  endif(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
-  if(NOT Boost_PYTHON_FOUND)
-	  message(STATUS "Trying to find libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-	  find_package(Boost 1.36.0 COMPONENTS
-                   "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-	  if(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
-	    set(Boost_PYTHON_FOUND ON)
-	    set(Boost_PYTHON_LIBRARY "${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}")
-	  else(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
-	    set(Boost_PYTHON_FOUND OFF)
-	  endif(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
-  endif(NOT Boost_PYTHON_FOUND)
-  if(NOT Boost_PYTHON_FOUND)
-    message(STATUS "Trying to find libboost_python-py${PYTHON_VERSION_MAJOR}")
-    find_package(Boost 1.36.0 COMPONENTS
-			   "python-py${PYTHON_VERSION_MAJOR}")
-    if(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_FOUND)
-      set(Boost_PYTHON_FOUND ON)
-      set(Boost_PYTHON_LIBRARY "${Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_LIBRARY}")
-    else(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_FOUND)
-      set(Boost_PYTHON_FOUND OFF)
-    endif(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_FOUND)
-  endif(NOT Boost_PYTHON_FOUND)
-  if(NOT Boost_PYTHON_FOUND)
-    message(STATUS "Trying to find libboost_python${PYTHON_VERSION_MAJOR}")
-    find_package(Boost 1.36.0 COMPONENTS
-			   "python${PYTHON_VERSION_MAJOR}")
-    if(Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
-      set(Boost_PYTHON_FOUND ON)
-      set(Boost_PYTHON_LIBRARY "${Boost_PYTHON${PYTHON_VERSION_MAJOR}_LIBRARY}")
-    else(Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
-      set(Boost_PYTHON_FOUND OFF)
-    endif(Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
-  endif(NOT Boost_PYTHON_FOUND)
-  if(NOT Boost_PYTHON_FOUND)
-    message(STATUS "Trying to find libboost_python")
-    find_package(Boost 1.36.0 COMPONENTS python)
-  endif(NOT Boost_PYTHON_FOUND)
-  if(Boost_PYTHON_FOUND)
-    message(STATUS "Boost library python found (${Boost_PYTHON_LIBRARY}).")
-  else(Boost_PYTHON_FOUND)
-    message(FATAL_ERROR "Boost python libraries not found.\n"
-      "Required packages are :" ${BOOST_MANDATORY_COMPONENTS})
-  endif(Boost_PYTHON_FOUND)
-  if(DEFINED MGIS_TMP_BUILD_SHARED_LIBS)
-    set(BUILD_SHARED_LIBS ${MGIS_TMP_BUILD_SHARED_LIBS})
-    unset(MGIS_TMP_BUILD_SHARED_LIBS)
-  endif(DEFINED MGIS_TMP_BUILD_SHARED_LIBS)
-  list(APPEND CPACK_COMPONENTS_ALL python_bindings)
-  set(CPACK_COMPONENT_PYTHON_BINDINGS_DESCRIPTION
-    "Contains the python bindings for TFEL, MFront and MTest")
-  set(CPACK_COMPONENT_PYTHON_BINDINGS_DEPENDS  core mfront mtest)
-  if(enable-broken-boost-python-module-visibility-handling)
-      add_definitions("-DMGIS_BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY")
-  endif(enable-broken-boost-python-module-visibility-handling)
+  if(enable-pybind11)
+    find_package(pybind11 CONFIG REQUIRED)
+  else(enable-pybind11)
+    include(cmake/modules/boost-python.cmake)
+    detect_boost_python()
+  endif(enable-pybind11)
 endif(enable-python-bindings)
 
 # fenics-bindings (placed before compiler detection)

bindings/python/CMakeLists.txt

@@ -17,8 +17,8 @@ else(MGIS_APPEND_SUFFIX)
   endif(WIN32)
 endif(MGIS_APPEND_SUFFIX)
 
-add_subdirectory(src)
-add_subdirectory(mgis)
-if(MGIS_HAVE_TFEL)
-  add_subdirectory(tests)
-endif(MGIS_HAVE_TFEL)
+if(enable-pybind11)
+  add_subdirectory(pybind11)
+else(enable-pybind11)
+  add_subdirectory(boost)
+endif(enable-pybind11)