X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9aee84f687f4aa409f192f2d68722eb00db17d30..c1279242e832ddcc53bf8ceb0e112035f64a844d:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e63a070d55..9fd7c9c67d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,14 @@ project(simgrid CXX C)
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
-### Version 3.5.99, aka 3.6 svn
+## Mapping version number -> version name
+# 3.5.99 -> alpha1 (oops)
+# 3.5.91 -> beta1
+# 3.5.92 -> beta2
+### Version 3.5.91, aka 3.6 beta1
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "5")
-set(SIMGRID_VERSION_PATCH "99")
+set(SIMGRID_VERSION_PATCH "92")
 set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
 set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")
@@ -19,7 +23,6 @@ set(GCC_NEED_VERSION "4.0")
 
 ### SET THE LIBRARY EXTENSION AND GCC VERSION
 if(APPLE) #MAC
-    set(GCC_NEED_VERSION "4.5")
 	set(LIB_EXE "dylib")
 else(APPLE)
     if(WIN32) #WINDOWS
@@ -51,7 +54,6 @@ endif(VBC)
 
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)
-FIND_PROGRAM(VALGRIND_PATH valgrind)
 include(FindPerl)
 if(NOT PERL_EXECUTABLE)
 	message(FATAL_ERROR "-- SimGrid cannot be compiled without Perl installed -- sorry. Bailling out.")
@@ -215,18 +217,8 @@ endif(NOT WIN32)
 ### Make Exes
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
 
-### Make Simgrid.jar and Java examples
-if(HAVE_JAVA)
-	include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
-endif(HAVE_JAVA)
-
 ### Make tests
-if(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
-else(NOT WIN32)
-
-endif(NOT WIN32)
-
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 
 ### Setup the distrib