A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a misleading output
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
5194064
..
6e628d3
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,4
+1,5
@@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.6)
+# Java requires 2.8.6
project(SimGrid C CXX)
project(SimGrid C CXX)
@@
-84,13
+85,6
@@
if ((NOT DEFINED enable_smpi OR enable_smpi) AND NOT APPLE) # smpi is enabled by
enable_language(Fortran OPTIONAL)
endif()
enable_language(Fortran OPTIONAL)
endif()
-if (CMAKE_COMPILER_IS_GNUCC)
- if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.8")
- set (CMAKE_AR gcc-ar)
- set (CMAKE_RANLIB gcc-ranlib)
- endif()
-endif()
-
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Build the version number #
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Build the version number #
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@
-262,6
+256,10
@@
else()
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLibWin.cmake)
endif()
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)
### Make Exes
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)