X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43bf457039a3af662a42b2ff420a9cb0a48f9102..919d53973306ca235d39729d640610f5dfbaa615:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 252800e6d4..01e7aae9c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +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(simgrid_version "3.4")
-set(USE_RPATH false)
+
+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)
@@ -67,9 +71,12 @@ 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 REPLACE "^.*Test.*\\:+" " " test ${test})
-	string(STRIP ${test} test)
-	if(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)
+	endif(test_ok_1 OR test_ok_2)
 endforeach(test ${LIST_OF_TEST})