X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d96858a5d972ece808c8bb79a8add51f6235603..52cdab43b062ef34f83de8c8ced7c29f43b2d16d:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index be9a19019d..a53bc852b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,7 +286,7 @@ endif() # Checks for header libraries functions. CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_POSIX_GETTIME) CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "" HAVE_PTHREAD_SETAFFINITY) -CHECK_INCLUDE_FILE("pthread_np" HAVE_PTHREAD_NP_H) # for pthread_setaffinity_np() on FreeBSD +CHECK_INCLUDE_FILE("pthread_np.h" HAVE_PTHREAD_NP_H) # for pthread_setaffinity_np() on FreeBSD if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(CMAKE_REQUIRED_DEFINITIONS "-D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE") @@ -521,6 +521,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/config.h) file(REMOVE ${CMAKE_BINARY_DIR}/src/internal_config.h.generated) file(REMOVE ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated) +file(REMOVE ${CMAKE_BINARY_DIR}/src/simgrid/version.h.generated) # We need two versions of the SMPI scripts because they contain the path to the library # so, it depends of whether SimGrid is installed, or run from the sources (during the build) @@ -772,6 +773,9 @@ endif() # Python binding (with pybind11) ################ +if(EXISTS pybind11) # Try to use a local copy of pybind11, if any + add_subdirectory(pybind11) +endif() # Our usage of pybind11::overload_cast mandates C++14 get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES) @@ -799,7 +803,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}")