X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa0625d7ccfa7a3d0e1edfeca3f8ba3c4a5e918f..b37037e5e2125306aa1c5472c9171cda0791cca0:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 670f2eddc9..053c42fc59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ endif() ## ## Check the C/C++ standard that we need -## See also tools/cmake/GCCFlags.cmake that sets our paranoid warning flags +## See also tools/cmake/Flags.cmake that sets our paranoid warning flags INCLUDE(CheckCCompilerFlag) CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER) @@ -286,6 +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.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") @@ -505,7 +506,7 @@ endif() ### Setup gcc & clang flags if (NOT MSVC) - include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake) endif() ### Generate the required headers and scripts @@ -520,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)