Add verification before install doc. Cosmetics.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9bd622..d4a17f1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
 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")
+project(Simgrid CXX C)

 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(release_version "3.5")
 set(libsimgrid_version "${release_version}")
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(release_version "3.5")
 set(libsimgrid_version "${release_version}")


@@ -10,10 +8,7 @@ set(libgras_version "${release_version}")
 set(libsmpi_version "${release_version}")
 
 ### Find programs and paths
 set(libsmpi_version "${release_version}")
 
 ### Find programs and paths

-find_program(SH_EXE NAMES sh)

 find_program(SED_EXE NAMES sed)
 find_program(SED_EXE NAMES sed)

-find_program(PWD_EXE NAMES pwd)
-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)
 
 find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
 find_path(VALGRIND_PATH        NAMES valgrind  PATHS NO_DEFAULT_PATHS)
 


@@ -24,9 +19,12 @@ SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/bin")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/.libs")
 SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/bin")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/.libs")

-set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include/ -L${gtnets_path}/lib")
+set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src")

 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 

+if(EXISTS /usr/include/)
+       set(INCLUDES "${INCLUDES} -I/usr/include/")
+endif(EXISTS /usr/include/)

 
 if(enable_coverage)
        add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
 
 if(enable_coverage)
        add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 7eba494..bc298c9 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -3,9 +3,6 @@ include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
 
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
 

-find_program(SET_MAKE NAMES make)
-find_program(CAT_EXE NAMES cat)
-

 # Checks for header libraries functions.
 
 CHECK_LIBRARY_EXISTS(pthread   pthread_create          NO_DEFAULT_PATHS pthread)
 # Checks for header libraries functions.
 
 CHECK_LIBRARY_EXISTS(pthread   pthread_create          NO_DEFAULT_PATHS pthread)


@@ -54,6 +51,86 @@ CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)

+SET(HAVE_RUBY 0)
+set(HAVE_LUA 0)
+SET(HAVE_JAVA 0)
+SET(HAVE_TRACING 0)
+
+if(enable_tracing)
+       SET(HAVE_TRACING 1)
+endif(enable_tracing)
+
+if(enable_lua)
+       exec_program("lua -v" OUTPUT_VARIABLE LUA_VERSION)
+       string(REGEX MATCH "[0-9].[0-9].[0-9]" LUA_VERSION "${LUA_VERSION}")
+       string(REGEX MATCH "^[0-9]" LUA_MAJOR_VERSION "${LUA_VERSION}")
+       string(REPLACE "${LUA_MAJOR_VERSION}." "" LUA_VERSION "${LUA_VERSION}")
+       string(REGEX MATCH "^[0-9]" LUA_MINOR_VERSION "${LUA_VERSION}")
+       string(REPLACE "${LUA_MINOR_VERSION}." "" LUA_PATCH_VERSION "${LUA_VERSION}")
+
+       if(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
+       
+               find_path(HAVE_LUA5_1_LUALIB_H
+               NAMES lualib.h 
+               PATHS "/sw/include/" "/usr/include/lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}/"
+               )
+               find_path(HAVE_LUA5_1_LAUXLIB_H
+               NAMES lauxlib.h
+               PATHS "/sw/include/" "/usr/include/lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}/"
+               )
+               find_library(LUA_LIB_PATH_1
+               NAMES lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}
+               PATHS /usr
+               )
+               find_library(LUA_LIB_PATH_2
+               NAMES lua-${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}
+               PATHS /usr
+               )
+               find_library(LUA_LIB_PATH_3
+               NAMES lua.${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION}
+               PATHS /sw
+               )
+       
+               if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
+                       set(HAVE_LUA 1)
+                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_LUA5_1_LUALIB_H} ")
+       
+                       if(NOT HAVE_LUA5_1_LUALIB_H STREQUAL HAVE_LUA5_1_LAUXLIB_H)
+                               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_LUA5_1_LAUXLIB_H} ")
+                               #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_LUA5_1_LAUXLIB_H} ")
+                       endif(NOT HAVE_LUA5_1_LUALIB_H STREQUAL HAVE_LUA5_1_LAUXLIB_H)
+               endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
+       
+               if(LUA_LIB_PATH_1)
+                       set(liblua lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION})
+                       set(lua_lib_path_to_use ${LUA_LIB_PATH_1})
+               endif(LUA_LIB_PATH_1)
+       
+               if(LUA_LIB_PATH_2)
+                       set(liblua lua-${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION})
+                       set(lua_lib_path_to_use ${LUA_LIB_PATH_2})
+               endif(LUA_LIB_PATH_2)
+       
+               if(LUA_LIB_PATH_3)
+                       set(liblua lua.${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION})
+                       set(lua_lib_path_to_use ${LUA_LIB_PATH_3})
+               endif(LUA_LIB_PATH_3)
+       
+               if(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
+                       set(HAVE_LUA 0)
+               else(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
+                       string(REGEX REPLACE "liblua.*" "" lua_lib_path_to_use ${lua_lib_path_to_use})
+                       string(REGEX MATCH "-L${lua_lib_path_to_use}" operation "${CMAKE_EXE_LINKER_FLAGS}")
+                       if(NOT operation)
+                               SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}-L${lua_lib_path_to_use} ")
+                       endif(NOT operation)
+               endif(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
+               
+       else(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
+               message("Lua binding need version 5.1.x actually version ${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.x")
+       endif(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
+       
+endif(enable_lua)

 
 if(enable_ruby)
        include(FindRuby)
 
 if(enable_ruby)
        include(FindRuby)


@@ -87,15 +164,10 @@ if(enable_ruby)
        
 endif(enable_ruby)
 
        
 endif(enable_ruby)
 

-if(enable_tracing)
-       SET(HAVE_TRACING 1)
-endif(enable_tracing)
-

 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA

-if(NOT enable_java)
-       SET(HAVE_JAVA 0)
-else(NOT enable_java)
+
+if(enable_java)

        include(FindJava)
        include(FindJNI)
        if(JAVA_INCLUDE_PATH)
        include(FindJava)
        include(FindJNI)
        if(JAVA_INCLUDE_PATH)


@@ -110,7 +182,7 @@ else(NOT enable_java)
        else(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) 
                SET(HAVE_JAVA 0)
        endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
        else(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) 
                SET(HAVE_JAVA 0)
        endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)

-endif(NOT enable_java)
+endif(enable_java)

 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT GTNETS
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT GTNETS


@@ -133,9 +205,9 @@ endif(NOT enable_gtnets)
 ### Initialize of CONTEXT THREADS
 
 if(pthread)
 ### Initialize of CONTEXT THREADS
 
 if(pthread)

-set(pthread 1)
+       set(pthread 1)

 elseif(pthread)
 elseif(pthread)

-set(pthread 0)
+       set(pthread 0)

 endif(pthread)
 
 if(pthread)
 endif(pthread)
 
 if(pthread)


@@ -184,7 +256,7 @@ try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR
        ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c
        COMPILE_DEFINITIONS "${mcsc_flags}"
        )
        ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c
        COMPILE_DEFINITIONS "${mcsc_flags}"
        )

-file(READ "${Project_BINARY_DIR}/conftestval" mcsc)
+file(READ "${Simgrid_BINARY_DIR}/conftestval" mcsc)

 STRING(REPLACE "\n" "" mcsc ${mcsc})
 if(mcsc)
        set(mcsc "yes")
 STRING(REPLACE "\n" "" mcsc ${mcsc})
 if(mcsc)
        set(mcsc "yes")


@@ -255,80 +327,6 @@ if(NOT with_context_ok)
        message(FATAL_ERROR "-Dwith-context must be either ucontext or pthread")
 endif(NOT with_context_ok)
 
        message(FATAL_ERROR "-Dwith-context must be either ucontext or pthread")
 endif(NOT with_context_ok)
 

-set(HAVE_LUA 0)
-
-if(enable_lua)
-       exec_program("lua -v" OUTPUT_VARIABLE LUA_VERSION)
-       string(REGEX MATCH "[0-9].[0-9].[0-9]" LUA_VERSION "${LUA_VERSION}")
-       string(REGEX MATCH "^[0-9]" LUA_MAJOR_VERSION "${LUA_VERSION}")
-       string(REPLACE "${LUA_MAJOR_VERSION}." "" LUA_VERSION "${LUA_VERSION}")
-       string(REGEX MATCH "^[0-9]" LUA_MINOR_VERSION "${LUA_VERSION}")
-       string(REPLACE "${LUA_MINOR_VERSION}." "" LUA_PATCH_VERSION "${LUA_VERSION}")
-
-       if(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
-       
-               find_path(HAVE_LUA5_1_LUALIB_H
-               NAMES lualib.h 
-               PATHS "/sw/include/" "/usr/include/lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}/"
-               )
-               find_path(HAVE_LUA5_1_LAUXLIB_H
-               NAMES lauxlib.h
-               PATHS "/sw/include/" "/usr/include/lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}/"
-               )
-               find_library(LUA_LIB_PATH_1
-               NAMES lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}
-               PATHS /usr
-               )
-               find_library(LUA_LIB_PATH_2
-               NAMES lua-${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}
-               PATHS /usr
-               )
-               find_library(LUA_LIB_PATH_3
-               NAMES lua.${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION}
-               PATHS /sw
-               )
-       
-               if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
-                       set(HAVE_LUA 1)
-                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_LUA5_1_LUALIB_H} ")
-       
-                       if(NOT HAVE_LUA5_1_LUALIB_H STREQUAL HAVE_LUA5_1_LAUXLIB_H)
-                               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_LUA5_1_LAUXLIB_H} ")
-                               #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_LUA5_1_LAUXLIB_H} ")
-                       endif(NOT HAVE_LUA5_1_LUALIB_H STREQUAL HAVE_LUA5_1_LAUXLIB_H)
-               endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
-       
-               if(LUA_LIB_PATH_1)
-                       set(liblua lua${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION})
-                       set(lua_lib_path_to_use ${LUA_LIB_PATH_1})
-               endif(LUA_LIB_PATH_1)
-       
-               if(LUA_LIB_PATH_2)
-                       set(liblua lua-${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION})
-                       set(lua_lib_path_to_use ${LUA_LIB_PATH_2})
-               endif(LUA_LIB_PATH_2)
-       
-               if(LUA_LIB_PATH_3)
-                       set(liblua lua.${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION})
-                       set(lua_lib_path_to_use ${LUA_LIB_PATH_3})
-               endif(LUA_LIB_PATH_3)
-       
-               if(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
-                       set(HAVE_LUA 0)
-               else(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
-                       string(REGEX REPLACE "liblua.*" "" lua_lib_path_to_use ${lua_lib_path_to_use})
-                       string(REGEX MATCH "-L${lua_lib_path_to_use}" operation "${CMAKE_EXE_LINKER_FLAGS}")
-                       if(NOT operation)
-                               SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}-L${lua_lib_path_to_use} ")
-                       endif(NOT operation)
-               endif(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
-               
-       else(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
-               message("Lua binding need version 5.1.x actually version ${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.x")
-       endif(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
-       
-endif(enable_lua)
-

 ###############
 ## SVN version check
 ##
 ###############
 ## SVN version check
 ##


@@ -470,7 +468,7 @@ if(HAVE_MAKECONTEXT)
                COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
                )
        
                COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
                )
        

-       file(READ ${Project_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
+       file(READ ${Simgrid_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)

        string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")
        string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")


@@ -489,7 +487,7 @@ endif(HAVE_MAKECONTEXT)
                ${PROJECT_DIRECTORY}
                ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_stackgrowth.c
                )
                ${PROJECT_DIRECTORY}
                ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_stackgrowth.c
                )

-file(READ "${Project_BINARY_DIR}/conftestval" stack)
+file(READ "${Simgrid_BINARY_DIR}/conftestval" stack)

 if(stack MATCHES "down")
        set(PTH_STACKGROWTH "-1")
 endif(stack MATCHES "down")
 if(stack MATCHES "down")
        set(PTH_STACKGROWTH "-1")
 endif(stack MATCHES "down")

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 49af361..67492b6 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -167,6 +167,13 @@ endforeach(file ${ex_to_svg})
 
 add_custom_command(TARGET install-simgrid
        COMMAND echo "install doc/examples  OK"
 
 add_custom_command(TARGET install-simgrid
        COMMAND echo "install doc/examples  OK"

+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+if(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+       file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/doc/html/)
+endif(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+
+add_custom_command(TARGET install-simgrid

        COMMAND cp ${PROJECT_DIRECTORY}/doc/html/* $ENV{DESTDIR}${prefix}/doc/simgrid/html/
        COMMAND echo "install doc/html      OK"
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
        COMMAND cp ${PROJECT_DIRECTORY}/doc/html/* $ENV{DESTDIR}${prefix}/doc/simgrid/html/
        COMMAND echo "install doc/html      OK"
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}"

diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt
index 1c5f435..2cd0927 100644 (file)
--- a/buildtools/Cmake/src/CMakeOption.txt
+++ b/buildtools/Cmake/src/CMakeOption.txt
@@ -38,7 +38,6 @@ mark_as_advanced(BUILDNAME)
 mark_as_advanced(ADDR2LINE)
 mark_as_advanced(BIBTOOL_PATH)
 mark_as_advanced(BUILD_TESTING)
 mark_as_advanced(ADDR2LINE)
 mark_as_advanced(BIBTOOL_PATH)
 mark_as_advanced(BUILD_TESTING)

-mark_as_advanced(CAT_EXE)

 mark_as_advanced(CMAKE_BUILD_TYPE)
 mark_as_advanced(CMAKE_INSTALL_PREFIX)
 mark_as_advanced(DART_ROOT)
 mark_as_advanced(CMAKE_BUILD_TYPE)
 mark_as_advanced(CMAKE_INSTALL_PREFIX)
 mark_as_advanced(DART_ROOT)


@@ -47,14 +46,10 @@ mark_as_advanced(FIG2DEV_PATH)
 mark_as_advanced(FLEXML_EXE)
 mark_as_advanced(FLEX_EXE)
 mark_as_advanced(PERL_EXE)
 mark_as_advanced(FLEXML_EXE)
 mark_as_advanced(FLEX_EXE)
 mark_as_advanced(PERL_EXE)

-mark_as_advanced(GCC_PATH)

 mark_as_advanced(GCOV_PATH)
 mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)
 mark_as_advanced(GCOV_PATH)
 mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)

-mark_as_advanced(PWD_EXE)

 mark_as_advanced(SED_EXE)
 mark_as_advanced(SED_EXE)

-mark_as_advanced(SET_MAKE)
-mark_as_advanced(SH_EXE)

 mark_as_advanced(SVN)
 mark_as_advanced(GIT)
 mark_as_advanced(VALGRIND_PATH)
 mark_as_advanced(SVN)
 mark_as_advanced(GIT)
 mark_as_advanced(VALGRIND_PATH)

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 69c2a9b..40ffb66 100644 (file)
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -5,7 +5,7 @@ if(enable_print_message)
        message("")
        message("________________________________________________________________________________")
        message("________________________________________________________________________________ DEBUG")
        message("")
        message("________________________________________________________________________________")
        message("________________________________________________________________________________ DEBUG")

-       message("Project_BINARY_DIR   : ${Project_BINARY_DIR}")
+       message("Simgrid_BINARY_DIR   : ${Simgrid_BINARY_DIR}")

        message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}")
        message("")
        message("SIZEOF_MAX :                   ${SIZEOF_MAX}")
        message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}")
        message("")
        message("SIZEOF_MAX :                   ${SIZEOF_MAX}")