X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ddbdc25753a729517ed23899c83eb808acdd50f..58bb34bb3a854fb4ea3f1daf6ed3c742efb89e1d:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 053c42fc59..681c4cf74c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,7 +254,7 @@ endif()
 set(_Boost_STACKTRACE_HEADERS           "boost/stacktrace.hpp")
 set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
 
-find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace unit_test_framework)
+find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace)
 set(Boost_FOUND 1) # These components are optionals
 message(STATUS "Mandatory components found. SimGrid is compilable.")
 message(STATUS "Looking for optional Boost components:")
@@ -276,12 +276,6 @@ else()
   set(HAVE_BOOST_CONTEXTS 0)
 endif()
 
-if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  message(STATUS  "  unit_test_framework: found. Activating the Boost-based unit tests.")
-else()
-  message(STATUS  "  unit_test_framework: MISSING. Install libboost-test-dev (>= v1.59) to activate the Unit Tests.")
-endif()
-
 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
@@ -504,7 +498,10 @@ else()
   set(GIT_VERSION "none, release version")
 endif()
 
-### Setup gcc & clang flags
+### Define source packages for Libs
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
+
+### Setup gcc & clang flags (include after DefinePackage.cmake, and before generating header files)
 if (NOT MSVC)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
 endif()
@@ -751,14 +748,10 @@ endif()
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
   "${generated_files_to_clean}")
 
-### Define source packages for Libs
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
-
 add_custom_target(tests COMMENT "Recompiling the tests")
 
 ### Build some Maintainer files
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
 
 ### Make Libs
 if(NOT WIN32)
@@ -773,14 +766,30 @@ endif()
 
 # Python binding (with pybind11)
 ################
-
 # Our usage of pybind11::overload_cast mandates C++14
 get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
-if ("cxx_std_14" IN_LIST known_features)
-  find_package(pybind11 2.2.0)
+
+if("cxx_std_14" IN_LIST known_features)
+
+  if(EXISTS ${CMAKE_HOME_DIRECTORY}/pybind11) # Try to use a local copy of pybind11, if any
+    message(STATUS "Use the internal copy of pybind11 (using C++14).")
+    add_subdirectory(${CMAKE_HOME_DIRECTORY}/pybind11)
+    set(pybind11_FOUND ON)
+    
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/pybind11/tools/)
+    set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+    find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
+    
+  else()
+    find_package(pybind11 2.2.0)
+  endif()
+  
   if(NOT PYTHONLIBS_FOUND)
+    message(STATUS "Python libs not found. Turn pybind11 off.")
+
     set(pybind11_FOUND OFF)
   endif()
+  
 else()
   message(STATUS "No support for C++14 detected, don't even search for pybind11.")
   set(pybind11_FOUND OFF)
@@ -800,7 +809,9 @@ if(enable_python)
     pybind11_add_module(python-bindings src/bindings/python/simgrid_python.cpp)
     target_compile_features(python-bindings PRIVATE cxx_std_14)
     target_link_libraries(python-bindings PUBLIC simgrid)
-    set_target_properties(python-bindings PROPERTIES LIBRARY_OUTPUT_NAME simgrid)
+    set_target_properties(python-bindings PROPERTIES
+                          LIBRARY_OUTPUT_NAME simgrid
+                          CXX_VISIBILITY_PRESET "default")
     add_dependencies(tests python-bindings)
     set_property(TARGET python-bindings
                  APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")