Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index b33553e..00ea0f3 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -85,7 +85,8 @@ endif()
 if(enable_java)
   find_package(Java REQUIRED COMPONENTS Runtime Development)
   find_package(JNI REQUIRED)
-  include(UseJava)
+  message("-- [Java] JNI found: ${JNI_FOUND}")
+  message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
   set(HAVE_Java 1)
 endif()
 if(enable_lua)
@@ -770,6 +771,7 @@ configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in"                "${CMAKE_
 
 set(top_srcdir "${CMAKE_HOME_DIRECTORY}")
 set(srcdir "${CMAKE_HOME_DIRECTORY}/src")
+set(bindir "${CMAKE_BINARY_DIR}")
 
 ### Script used when simgrid is installed
 set(exec_prefix ${CMAKE_INSTALL_PREFIX})