Cosmetics.

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

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index 3624b1f..6e833ce 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -1,25 +1,19 @@
 # Configure CTest. For details, see:
 # http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
 
-SET(BUILDNAME "none" CACHE TYPE INTERNAL FORCE)
+if(APPLE)
+       SET(BUILDNAME "APPLE" CACHE TYPE INTERNAL FORCE)
+else(APPLE)
+       SET(BUILDNAME "UNIX" CACHE TYPE INTERNAL FORCE)
+       if(WIN32)
+       SET(BUILDNAME "WINDOWS" CACHE TYPE INTERNAL FORCE)
+       endif(WIN32)
+endif(APPLE)
+
 if(enable_memcheck)
        set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST
 endif(enable_memcheck)
 
-if(CONTEXT_THREADS AND CONTEXT_UCONTEXT)
-       SET(BUILDNAME "BOTH_CONTEXT" CACHE TYPE INTERNAL FORCE)
-elseif(CONTEXT_THREADS AND CONTEXT_UCONTEXT)
-       
-       if(CONTEXT_UCONTEXT)
-               SET(BUILDNAME "UCONTEXT" CACHE TYPE INTERNAL FORCE)
-       endif(CONTEXT_UCONTEXT)
-       
-       if(CONTEXT_THREADS)
-               SET(BUILDNAME "PTHREAD" CACHE TYPE INTERNAL FORCE)
-       endif(CONTEXT_THREADS)
-
-endif(CONTEXT_THREADS AND CONTEXT_UCONTEXT)
-
 if(enable_compile_warnings AND enable_compile_optimizations)
        SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)
 endif(enable_compile_warnings AND enable_compile_optimizations)
@@ -40,10 +34,6 @@ if(enable_memcheck)
        SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE)
 endif(enable_memcheck)
 
-if(WIN32)
-       SET(BUILDNAME "WINDOWS" CACHE TYPE INTERNAL FORCE)
-endif(WIN32)
-
 set(osname ${CMAKE_SYSTEM_NAME})
 set(cpu ${CMAKE_SYSTEM_PROCESSOR})
 set(DISTRIB2 ${CMAKE_SYSTEM_VERSION})

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 4a40d78..a3b6001 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -106,7 +106,6 @@ message("")
 message("             CFlags  :        ${CMAKE_C_FLAGS}")      
 message("             CPPFlags:        ${CMAKE_CXX_FLAGS}")
 message("")
-message("      Context backend:        ${with_context}")
 if(NOT APPLE AND NOT WIN32)
 message("      Compile Gtnets :        ${HAVE_GTNETS}")
 message("      Gtnets path    :        ${gtnets_path}")