We don't intend to support pre-ansi platforms, so cleanup mmalloc code

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5bd133..4364613 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,18 @@
 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(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(release_version "3.4.1")
+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)
 find_program(SED_EXE NAMES sed)
 find_program(PWD_EXE NAMES pwd)
-find_program(UNAME NAMES uname)
-find_program(HOSTNAME_CMD NAMES hostname)
-find_program(CAT NAMES cat)
 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)
@@ -50,6 +51,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)
@@ -67,10 +73,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 MATCH "^.*Test.*\\:+" test_ok ${test})
-       if(test_ok)
-               string(REGEX REPLACE "^.*Test.*\\:+" " " 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)
+       endif(test_ok_1 OR test_ok_2)
 endforeach(test ${LIST_OF_TEST})