X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e80a41c3038eba8dbe7242fecc6b44362f5fe35..241f8b2307c8cf43a9f7fa4fb69ec74a59bf47b2:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c16dfcb862..6d7acad296 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
@@ -232,12 +227,6 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
 
 ENDIF()
 
-if(ARCH_32_BITS)
-  set(MPI_ADDRESS_SIZE 4)
-else()
-  set(MPI_ADDRESS_SIZE 8)
-endif()
-
 include(CheckFunctionExists)
 include(CheckTypeSize)
 include(CheckIncludeFile)
@@ -447,6 +436,7 @@ 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)