X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0c5b1ab11469128ad826610f54b1f0f332bd172..91b3883142b769ef1fc0b7d460f78d2ae526bca2:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 58d7dbb5de..19a9267fe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,7 @@ endif() #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "16") +set(SIMGRID_VERSION_MINOR "17") set(SIMGRID_VERSION_PATCH "0") set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1) @@ -160,13 +160,17 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) ### Compute the include paths set(INCLUDES + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/include ) +if(enable_smpi) + set (INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/src/smpi/include) +endif() + if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/) set(INCLUDES ${INCLUDES} /usr/include/) endif()