Make target testall for all.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7515 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f834750..67a181e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")
+set_property(GLOBAL PROPERTY Label "${SVN_VERSION}${GIT_VERSION}")
 
 ### Find programs and paths
 find_program(SH_EXE NAMES sh)

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 72c1f14..77953df 100644 (file)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -686,6 +686,7 @@ set(to_svg
        ${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h
        ${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h
        ${PROJECT_DIRECTORY}/./src/simgrid_units_main.c
+       ${TEST_UNITS}
        ${PROJECT_DIRECTORY}/./src/bindings/lua/master_slave.lua
        ${PROJECT_DIRECTORY}/./src/bindings/lua/mult_matrix.lua
        ${PROJECT_DIRECTORY}/./examples/lua/master_slave.lua

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 086d9b4..ae25901 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -63,12 +63,9 @@ target_link_libraries(smpi   simgrid ${SMPI_DEP} -fprofile-arcs)
 
 ### Make EXEs
 
-if(enable_maintainer_mode)
-#src
+#src/testall
 add_subdirectory(${PROJECT_DIRECTORY}/src)
-endif(enable_maintainer_mode)
 
-#tools
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 

diff --git a/buildtools/Cmake/src/CTestConfig.cmake b/buildtools/Cmake/src/CTestConfig.cmake
index 8053bc9..d191889 100644 (file)
--- a/buildtools/Cmake/src/CTestConfig.cmake
+++ b/buildtools/Cmake/src/CTestConfig.cmake
@@ -60,14 +60,11 @@ if(enable_memcheck)
        SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE)
 endif(enable_memcheck)
 
-SET(BUILDNAME "rev(${SVN_VERSION}${GIT_VERSION})-${BUILDNAME}")
-
 SET(SITE "${osname}_${DISTRIB2}_${cpu}")
 SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}")
 SET(CTEST_PROJECT_NAME "${PROJECT_NAME}")
 SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
 SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
-
 string(REPLACE "/" "" SITE ${SITE})
 exec_program("echo $PIPOL_IMAGE" OUTPUT_VARIABLE PIPOL_IMAGE)
 #message("PIPOL_IMAGE : \"${PIPOL_IMAGE}\"")