X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/35e30f108115bd9ec6e70067beb74807ec8293c9..3bda7845c0cceaaeedd5d0371434927c8cf6231d:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dfb7d491c..e46f6b888c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6) # Java requires 2.8.6
+cmake_minimum_required(VERSION 2.8.8)
 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules)
 
@@ -138,27 +138,22 @@ string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)
 include(FindPerl)
-if(NOT PERL_EXECUTABLE)
-  message(FATAL_ERROR "-- SimGrid cannot be compiled without Perl installed -- sorry. Bailling out.")
+if(NOT PERL_FOUND)
+  message(FATAL_ERROR "Please install Perl to compile SimGrid.")
 endif()
 
 if (APPLE)
   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()
-
-### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 ### Compute the include paths
 set(INCLUDES
   ${CMAKE_HOME_DIRECTORY}
   ${CMAKE_HOME_DIRECTORY}/include
-  ${CMAKE_HOME_DIRECTORY}/src
   ${CMAKE_HOME_DIRECTORY}/src/include
-  ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/include
-  ${CMAKE_BINARY_DIR}/src
   )
 
 if(WIN32)
@@ -439,14 +434,12 @@ endif()
 
 if(enable_smpi)
   include(FindGFortran)
-  #really checks for objdump for privatization
-  find_package(BinUtils QUIET)
-  mark_as_advanced(BinUtils_DIR)
   SET(HAVE_SMPI 1)
-
-  if( NOT "${CMAKE_OBJDUMP}" MATCHES "CMAKE_OBJDUMP-NOTFOUND" AND HAVE_MMAP)
+  if("${CMAKE_SYSTEM}" MATCHES "Linux")
+    SET(USE_LIBUTIL 0)
     SET(HAVE_PRIVATIZATION 1)
-  else()
+  elseif("${CMAKE_SYSTEM}" MATCHES "^FreeBSD")
+    SET(USE_LIBUTIL 0)
     SET(HAVE_PRIVATIZATION 0)
   endif()
 endif()