X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3203ed1f4fb6f4617e94d5351661ba07e8b8f833..145df5da7bc0323bf1817c9c8602482726aa5a08:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d7acad296..dff73aab7d 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)
 
@@ -153,6 +153,7 @@ set(INCLUDES
   ${CMAKE_HOME_DIRECTORY}
   ${CMAKE_HOME_DIRECTORY}/include
   ${CMAKE_HOME_DIRECTORY}/src/include
+  ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/include
   )
 
@@ -237,18 +238,6 @@ include(CheckSymbolExists)
 include(FindGraphviz)
 include(FindLibSigc++)
 
-if(enable_java)
-  find_package(Java REQUIRED COMPONENTS Runtime Development)
-  find_package(JNI REQUIRED)
-  message("-- [Java] JNI found: ${JNI_FOUND}")
-  message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
-  if(enable_maintainer_mode)
-    find_package(SWIG REQUIRED)
-    include(UseSWIG)
-    message("-- [Java] Swig found: ${SWIG_FOUND} (version ${SWIG_VERSION})")
-  endif()
-  set(HAVE_Java 1)
-endif()
 if(enable_scala)
   find_package(Scala REQUIRED)
   message("-- [Scala] scalac found: ${SCALA_COMPILE}")
@@ -322,6 +311,7 @@ CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_VALGRIND_H)
 CHECK_INCLUDE_FILE("socket.h" HAVE_SOCKET_H)
 CHECK_INCLUDE_FILE("stat.h" HAVE_STAT_H)
 CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("sys/ptrace.h" HAVE_SYS_PTRACE_H)
 CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
 CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
 CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
@@ -434,14 +424,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()