X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dab54cf6b0e937ad09a2c33381f9df04cd136474..c3a137262e9f3aa15b16005208a42ec8315d98b0:/CMakeLists.txt?ds=sidebyside diff --git a/CMakeLists.txt b/CMakeLists.txt index 907ffaa556..6e628d32af 100644 --- 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) @@ -28,11 +29,6 @@ if (CMAKE_COMPILER_IS_GNUCC) "SimGrid needs at least g++ version 4.7 to compile " "(c++11 support of previous versions is too limited).") endif() - - if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.8") - set (CMAKE_AR gcc-ar) - set (CMAKE_RANLIB gcc-ranlib) - endif() endif() ## We need a decent support of the c++11 standard @@ -260,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)