[travis] detect linux as we should

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 985bd6d..6e628d3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
+# Java requires 2.8.6
 
 project(SimGrid C CXX)
 
@@ -255,6 +256,10 @@ else()
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLibWin.cmake)
 endif()
 
+if(enable_java)
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeJava.cmake)
+endif()
+
 ### Make Exes
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)