Remove the version built from buildname so that cdash notices that it's another build...

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

diff --git a/buildtools/Cmake/CMakeLists.txt b/buildtools/Cmake/CMakeLists.txt
index ae769e5..f6d54cf 100644 (file)
--- a/buildtools/Cmake/CMakeLists.txt
+++ b/buildtools/Cmake/CMakeLists.txt
@@ -9,10 +9,15 @@ OPTION( SIMGRID_WITH_PTHREAD "Use pthread as context support." OFF )
 
 OPTION( SIMGRID_USE_GTNETS "Build SimGrid with GTNets support." OFF )
 
 
 OPTION( SIMGRID_USE_GTNETS "Build SimGrid with GTNets support." OFF )
 

+### Display the version
+find_program(CAT NAMES cat)
+exec_program("${CAT}" ARGS "version" OUTPUT_VARIABLE VERSION)
+message("svn version: " ${VERSION})
+
+

 ### Check 32bits or 64bits
 INCLUDE (CheckTypeSize)
 CHECK_TYPE_SIZE("long" SIZEOF_LONG)
 ### Check 32bits or 64bits
 INCLUDE (CheckTypeSize)
 CHECK_TYPE_SIZE("long" SIZEOF_LONG)

-#message("SIZEOF_LONG : ${SIZEOF_LONG}")

 IF(SIZEOF_LONG EQUAL 4)
   SET(ARCH_32_BITS 1)
 ELSE(SIZEOF_LONG EQUAL 4)
 IF(SIZEOF_LONG EQUAL 4)
   SET(ARCH_32_BITS 1)
 ELSE(SIZEOF_LONG EQUAL 4)

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index f7da28f..45ab81c 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -38,7 +38,8 @@ getuname(node -n)
 getuname(osrel  -r)
 getuname(cpu    -m)
        
 getuname(osrel  -r)
 getuname(cpu    -m)
        

-SET (BUILDNAME "${VERSION}-${osname}-${DISTRIB2}-${cpu}")
+#SET (BUILDNAME "${VERSION}-${osname}-${DISTRIB2}-${cpu}")
+SET (BUILDNAME "${osname}-${DISTRIB2}-${cpu}")

 SET (SITE "${node}")
 SET (CTEST_PROJECT_NAME "Simgrid")
 SET (CTEST_DROP_METHOD "http")
 SET (SITE "${node}")
 SET (CTEST_PROJECT_NAME "Simgrid")
 SET (CTEST_DROP_METHOD "http")