Add a forget s to an variable and Cosmetics.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 771754b..00b4d8e 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -63,6 +63,9 @@ endif(enable_tracing)
 if(enable_model-checking AND HAVE_MMAP)
        SET(HAVE_MC 1)
        SET(MMALLOC_WANT_OVERIDE_LEGACY 1)
+else(enable_model-checking AND HAVE_MMAP)
+       SET(HAVE_MC 0)
+       SET(MMALLOC_WANT_OVERIDE_LEGACY 0)
 endif(enable_model-checking AND HAVE_MMAP)
 
 if(enable_lua)
@@ -699,10 +702,6 @@ configure_file("${PROJECT_DIRECTORY}/include/simgrid_config.h.in"                  "${PROJECT_
 configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/tracing_config.h.in"     "${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 configure_file("${PROJECT_DIRECTORY}/include/instr/tracing_config.h"           "${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
-if(NOT prefix)
-       set(prefix /usr/local)
-endif(NOT prefix)
-
 set(top_srcdir "${PROJECT_DIRECTORY}")
 set(srcdir "${PROJECT_DIRECTORY}/src")
 

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 2ea763a..d429fef 100755 (executable)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -513,12 +513,12 @@ set(simgrid_sources
        ${AMOK_SRC}
 )
 
-if(enable_model-checking AND HAVE_MMAP)
+if(HAVE_MC)
        set(simgrid_sources
-               ${simgrid_source}
+               ${simgrid_sources}
                ${MC_SRC}
                )
-endif(enable_model-checking AND HAVE_MMAP)
+endif(HAVE_MC)
 
 ### Gras Lib sources
 set(gras_sources

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index e176892..e2f68c7 100755 (executable)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -1,4 +1,4 @@
-set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
+set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE TYPE INTERNAL FORCE)
 
 #########################################
 ### Fill in the "make install" target ###

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 59cc536..82bbac4 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -3,7 +3,13 @@
 
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
 set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib")
-set(prefix ${prefix} CACHE PATH "Path where to install project")
+
+if(NOT prefix)
+       set(prefix "/usr/local/simgrid/" CACHE PATH "Path where to install project")
+else(NOT prefix)
+       set(prefix ${prefix} CACHE PATH "Path where to install project")
+endif(NOT prefix)
+
 set(with_context ${with_context} CACHE TYPE INTERNAL FORCE)
 
 if(NOT with_context)

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 1b6aa93..1a63324 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -99,6 +99,10 @@ if(enable_print_message)
        message("OPTIONS  :                     ${MEMORYCHECK_COMMAND_OPTIONS}")
        message("PERL     :                     ${PERL_EXECUTABLE}")
        endif(enable_memcheck)
+       message("")
+       message("HAVE_MMAP :                    ${HAVE_MMAP}")
+       message("HAVE_MC :                      ${HAVE_MC}")
+       message("MMALLOC_WANT_OVERIDE_LEGACY :  ${MMALLOC_WANT_OVERIDE_LEGACY}")
        message("________________________________________________________________________________")
        message("________________________________________________________________________________ DEBUG END")
        message("")