X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba7076c5f72d5b7cec9b0a88cb7d45fa5f62996a..009559ea73ca3e91b75aaf855249ed2f0ca6b122:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c59a3b210..68e71c4581 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ endif()
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "12")
 set(SIMGRID_VERSION_PATCH "0")
-set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
+# set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2015") # Year for copyright information
 
@@ -265,9 +265,6 @@ if(enable_java)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Java.cmake)
 endif()
 
-### Make Exes
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
-
 ### Make tests
 if(enable_memcheck_xml)
   set(enable_memcheck true)
@@ -275,17 +272,12 @@ endif()
 
 INCLUDE(CTest)
 ENABLE_TESTING()
-if(WIN32)
-  add_test(
-      NAME basic-java
-      COMMAND java -cp ${CMAKE_HOME_DIRECTORY}\\simgrid.jar;. masterslave/Masterslave ..\\platforms\\platform.xml masterslave\\masterslaveDeployment.xml
-      WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}\\examples\\java
-  )
-else()
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake)
-endif()
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Tests.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 
+### Define subdirectories
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
+
 ### Setup the distrib
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake)