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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e46f6b888c..2363facf59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
@@ -441,6 +431,9 @@ if(enable_smpi)
   elseif("${CMAKE_SYSTEM}" MATCHES "^FreeBSD")
     SET(USE_LIBUTIL 0)
     SET(HAVE_PRIVATIZATION 0)
+  else()
+    message (STATUS "Warning:  no support for SMPI automatic privatization on this platform")
+    SET(HAVE_PRIVATIZATION 0)
   endif()
 endif()
 
@@ -1190,7 +1183,7 @@ else()
   find_program(WGET_PROGRAM  NAMES wget)
   message(STATUS "wget: ${WGET_PROGRAM}")
   if(WGET_PROGRAM)
-    ADD_CUSTOM_TARGET(simgrid_documentation
+    ADD_CUSTOM_TARGET(documentation
       COMMENT "Downloading the SimGrid documentation..."
       COMMAND ${WGET_PROGRAM} -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/
       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html