X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd62453970416ecd110ca3df5814b3268309f0e7..076194816ead5f5e2a4afff5999e728c5b5396a3:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f834750926..a8a8819ea7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 2.6)
+exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")
+SET(PROJECT_LABEL "Simgrid")
+
+set(release_version "3.4")
+set(libsimgrid_version "${release_version}")
+set(libgras_version "${release_version}")
+set(libsmpi_version "${release_version}")
 
 ### Find programs and paths
 find_program(SH_EXE NAMES sh)
@@ -13,11 +20,8 @@ find_path(GCC_PATH NAMES gcc PATHS NO_DEFAULT_PATHS)
 find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
 find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
 
-### AUTO DETECT THE PROJECT_DIRECTORY
-exec_program("${PWD_EXE}" ARGS "| ${SED_EXE} 's/\\/Cmake//g'" OUTPUT_VARIABLE PROJECT_DIRECTORY)
-
 ### SET THE PROJECT_DIRECTORY
-#SET(PROJECT_DIRECTORY "/home/navarrop/Bureau/simgrid-trunk")
+SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
 SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
@@ -50,6 +54,11 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
 ### Make Libs and Exes
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
 
+### Make Simgrid.jar and Java examples
+if(HAVE_JAVA)
+	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeJarAndClass.txt)
+endif(HAVE_JAVA)
+
 ### Make tests
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
@@ -60,9 +69,19 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt)
 ### Print ARGS
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
 
-### Make Docs
-if(enable_maintainer_mode)
-	#include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
-endif(enable_maintainer_mode)
-
 INCLUDE(Dart)
+
+exec_program("ctest -N" OUTPUT_VARIABLE LIST_OF_TEST)
+string(REPLACE "\n" ";" LIST_OF_TEST ${LIST_OF_TEST})
+foreach(test ${LIST_OF_TEST})
+	string(REGEX REPLACE "^.*Test.*project.*" " " test ${test})
+	string(REGEX REPLACE "^.*Total.*Tests:.*" " " test ${test})
+	string(REGEX MATCH "^.*Testing.*" test_ok_1 ${test}) #for ctest version 2.6 (xxx/xxx Testing)
+	string(REGEX MATCH "^.*Test.*\\:+" test_ok_2 ${test}) #for ctest version 2.8 (Test #xxx)
+	if(test_ok_1 OR test_ok_2)
+		string(REGEX REPLACE "^.*Testing" " " test ${test}) #for ctest version 2.6
+		string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test}) #for ctest version 2.8
+		string(STRIP ${test} test)
+		set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}")
+	endif(test_ok_1 OR test_ok_2)
+endforeach(test ${LIST_OF_TEST})