Cosmetics

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index a81b6cb..a56f753 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -3,7 +3,7 @@ ${CMAKE_MODULE_PATH}
 ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
 )
 
-message("-- Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
+message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
 include(CheckFunctionExists)
 include(CheckIncludeFile)
@@ -14,6 +14,9 @@ TEST_BIG_ENDIAN(BIGENDIAN)
 
 include(FindGraphviz)
 include(FindPCRE)
+if(enable_gtnets)      
+       include(FindGTnets)
+endif(enable_gtnets)
 if(enable_ruby)
        include(FindRubySimgrid)        
 endif(enable_ruby)
@@ -92,7 +95,7 @@ if(enable_latency_bound_tracking)
        SET(HAVE_LATENCY_BOUND_TRACKING 1)
 else(enable_latency_bound_tracking)
   if(enable_gtnets)
-    message("-- Warning : Turning latency_bound_tracking to ON because GTNeTs is ON")
+    message(STATUS "Warning : Turning latency_bound_tracking to ON because GTNeTs is ON")
     SET(enable_latency_bound_tracking ON)
     SET(HAVE_LATENCY_BOUND_TRACKING 1)
   else(enable_gtnets)
@@ -114,7 +117,7 @@ if(enable_lua)
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${LUA_INCLUDE_DIR} ")
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${LUA_LIBRARY_DIR} ")
        else(LUA51_FOUND)
-               message("-- Warning : Lua need version 5.1")
+               message(STATUS "Warning : Lua need version 5.1")
        endif(LUA51_FOUND)
 endif(enable_lua)
 
@@ -128,31 +131,10 @@ if(enable_smpi)
                        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_F2C_H} ")
           endif(NOT operation)
        else(HAVE_F2C_H)
-               message("-- Warning : You should install f2c before use smpi.")
+               message(STATUS "Warning : You should install f2c before use smpi.")
        endif(HAVE_F2C_H)       
 endif(enable_smpi)
 
-#--------------------------------------------------------------------------------------------------
-### Initialize of CONTEXT GTNETS
-if(NOT enable_gtnets OR enable_supernovae)
-       SET(HAVE_GTNETS 0)
-else(NOT enable_gtnets OR enable_supernovae)
-       set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")
-       set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
-       exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR)      
-       if(COMPILE_GTNETS_VAR)
-               SET(HAVE_GTNETS 0)
-       else(COMPILE_GTNETS_VAR)
-               SET(HAVE_GTNETS 1)
-               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ")
-               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ")
-               string(REGEX MATCH "${gtnets_path}/lib" operation "$ENV{LD_LIBRARY_PATH}")
-               if(NOT operation)
-                       message(FATAL_ERROR "\n\nTo use GTNETS don't forget to set LD_LIBRARY_PATH with \n\texport LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${gtnets_path}/lib\n\n")
-               endif(NOT operation)
-       endif(COMPILE_GTNETS_VAR)
-endif(NOT enable_gtnets OR enable_supernovae)
-
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
 
@@ -267,7 +249,7 @@ endif(with_context MATCHES "pthreads")
 if(with_context MATCHES "auto")
        set(with_context_ok 1)
        set(with_context "ucontext")
-       message("-- With_context auto change to ucontext")
+       message(STATUS "With_context auto change to ucontext")
 endif(with_context MATCHES "auto")
 
 if(with_context MATCHES "ucontext")
@@ -277,10 +259,10 @@ if(with_context MATCHES "ucontext")
        else(mcsc)
                if(windows_context MATCHES "yes")
                        set(with_context "windows")
-                       message("-- With_context ucontext change to windows")
+                       message(STATUS "With_context ucontext change to windows")
                else(windows_context MATCHES "yes")
                        set(with_context "pthread")
-                       message("-- With_context ucontext change to pthread")
+                       message(STATUS "With_context ucontext change to pthread")
                endif(windows_context MATCHES "yes")
        endif(mcsc)
 endif(with_context MATCHES "ucontext")
@@ -307,7 +289,7 @@ endif(NOT with_context_ok)
 if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
        find_file(SVN ".svn" ${CMAKE_HOME_DIRECTORY})
        exec_program("svnversion ${CMAKE_HOME_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION")
-       message("-- svn version ${SVN_VERSION}")
+       message(STATUS "svn version ${SVN_VERSION}")
 endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
 
 if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 39ba55b..66961e0 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -167,7 +167,7 @@ endif(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND IC
 
 ##############################################################################"
 
-message("-- Check individual TOCs")
+message(STATUS "Check individual TOCs")
 file(GLOB_RECURSE LISTE_GTUT
        "${CMAKE_HOME_DIRECTORY}/doc/gtut-tour-*.doc"
 )
@@ -204,7 +204,7 @@ foreach(file_name ${LISTE_GTUT})
        
        exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc" OUTPUT_VARIABLE compare_files)
        if(compare_files)
-               message("-- Wrong toc for ${file_name}. Should be:")
+               message(STATUS "Wrong toc for ${file_name}. Should be:")
                file(READ "${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc" file_content)
                message("${file_content}")
                exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc")
@@ -214,7 +214,7 @@ endforeach(file_name ${LISTE_GTUT})
 file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc)
 file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc)
 
-message("-- Check main TOC")
+message(STATUS "Check main TOC")
 
 foreach(file_name ${LISTE_GTUT})
        file(READ "${file_name}" file_content)  
@@ -254,7 +254,7 @@ endforeach(line ${file_content})
        
 exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc" OUTPUT_VARIABLE compare_files)
 if(compare_files)
-       message("-- Wrong toc for gtut-tour.doc Right one is in tmp.realtoc")
+       message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc")
        exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc")
 else(compare_files)
        file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc)

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index e5a941d..116847f 100644 (file)
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -21,14 +21,14 @@ IF(FLEXML_EXE)
        string(REGEX MATCH "[0-9]*$" FLEXML_MINOR_VERSION "${FLEXML_VERSION}")
 ENDIF(FLEXML_EXE)
 
-message("-- Found flex: ${FLEX_EXE}")
-message("-- Found flexml: ${FLEXML_EXE}")
-message("-- Found sed: ${SED_EXE}")
+message(STATUS "Found flex: ${FLEX_EXE}")
+message(STATUS "Found flexml: ${FLEXML_EXE}")
+message(STATUS "Found sed: ${SED_EXE}")
 
 if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE)
 
-message("-- Flex version: ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
-message("-- Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
+message(STATUS "Flex version: ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
+message(STATUS "Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
 
 set(string1  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
 set(string2  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
@@ -124,16 +124,16 @@ ADD_CUSTOM_COMMAND(
 
 else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
        if(NOT HAVE_FLEXML)
-               message("-- Error : Install flexml before use maintainer mode.")
+               message(STATUS "Error : Install flexml before use maintainer mode.")
        endif(NOT HAVE_FLEXML)
        if(NOT HAVE_FLEX)
-               message("-- Error : Install flex before use maintainer mode.")
+               message(STATUS "Error : Install flex before use maintainer mode.")
        endif(NOT HAVE_FLEX)
        if(NOT SED_EXE)
-               message("-- Error : Install sed before use maintainer mode.")
+               message(STATUS "Error : Install sed before use maintainer mode.")
        endif(NOT SED_EXE)
        
-       message(FATAL_ERROR "-- Error : Need to install all tools for maintainer mode !!!")
+       message(FATAL_ERROR STATUS "Error : Need to install all tools for maintainer mode !!!")
 endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 
 endif(enable_maintainer_mode AND NOT WIN32)

diff --git a/buildtools/Cmake/Modules/FindF2c.cmake b/buildtools/Cmake/Modules/FindF2c.cmake
index 5736d3c..2c32af8 100644 (file)
--- a/buildtools/Cmake/Modules/FindF2c.cmake
+++ b/buildtools/Cmake/Modules/FindF2c.cmake
@@ -38,22 +38,22 @@ if(HAVE_F2C_H)
 set(HAVE_SMPI_F2C_H 1)
 endif(HAVE_F2C_H)
 
-message("-- Looking for f2c.h")
+message(STATUS "Looking for f2c.h")
 if(HAVE_F2C_H)
-message("-- Looking for f2c.h - found")
+message(STATUS "Looking for f2c.h - found")
 else(HAVE_F2C_H)
-message("-- Looking for f2c.h - not found")
+message(STATUS "Looking for f2c.h - not found")
 endif(HAVE_F2C_H)
 
-message("-- Looking for lib f2c")
+message(STATUS "Looking for lib f2c")
 if(HAVE_F2C_LIB)
-message("-- Looking for lib f2c - found")
+message(STATUS "Looking for lib f2c - found")
 else(HAVE_F2C_LIB)
-message("-- Looking for lib f2c - not found")
+message(STATUS "Looking for lib f2c - not found")
 endif(HAVE_F2C_LIB)
 
 if(F2C_EXE)
-message("-- Found F2C: ${F2C_EXE}")
+message(STATUS "Found F2C: ${F2C_EXE}")
 endif(F2C_EXE)
 
 mark_as_advanced(HAVE_F2C_H)

diff --git a/buildtools/Cmake/Modules/FindGTnets.cmake b/buildtools/Cmake/Modules/FindGTnets.cmake
new file mode 100644 (file)
index 0000000..9bb9e48
--- /dev/null
+++ b/buildtools/Cmake/Modules/FindGTnets.cmake
@@ -0,0 +1,59 @@
+find_path(HAVE_RNGSTREAM_H RngStream.h
+    HINTS
+    $ENV{LD_LIBRARY_PATH}
+    PATH_SUFFIXES include include/gtnets
+    PATHS
+    /opt
+    /opt/local
+    /opt/csw
+    /sw
+    /usr
+)
+
+find_library(HAVE_GTNETS_LIB
+    NAME gtnets
+    HINTS
+    $ENV{LD_LIBRARY_PATH}
+    PATH_SUFFIXES lib64 lib lib64/gtnets lib/gtnets
+    PATHS
+    /opt
+    /opt/local
+    /opt/csw
+    /sw
+    /usr
+)
+
+string(REPLACE "/libgtnets.${LIB_EXE}" ""  GTNETS_LIB_PATH "${HAVE_GTNETS_LIB}")
+
+exec_program("${CMAKE_CXX_COMPILER} -I${HAVE_RNGSTREAM_H} -lgtnets -L${GTNETS_LIB_PATH} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR)       
+if(COMPILE_GTNETS_VAR)
+       SET(HAVE_GTNETS 0)
+else(COMPILE_GTNETS_VAR)
+       SET(HAVE_GTNETS 1)
+endif(COMPILE_GTNETS_VAR)
+
+
+message(STATUS "Looking for RngStream.h")
+if(HAVE_RNGSTREAM_H)
+message(STATUS "Looking for RngStream.h - found")
+else(HAVE_RNGSTREAM_H)
+message(STATUS "Looking for RngStream.h - not found")
+endif(HAVE_RNGSTREAM_H)
+
+message(STATUS "Looking for lib gtnets patch")
+if(HAVE_GTNETS_LIB AND HAVE_GTNETS)
+message(STATUS "Looking for lib gtnets patch - found")
+else(HAVE_GTNETS_LIB AND HAVE_GTNETS)
+message(STATUS "Looking for lib gtnets patch - not found")
+endif(HAVE_GTNETS_LIB AND HAVE_GTNETS)
+
+#TODO NEED TO TEST IF PATHS ARE ALREADY SET BY CMAKE
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_RNGSTREAM_H} -L${GTNETS_LIB_PATH} ")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_RNGSTREAM_H} -L${GTNETS_LIB_PATH} ")
+string(REGEX MATCH "${GTNETS_LIB_PATH}" operation "$ENV{LD_LIBRARY_PATH}")
+if(NOT operation)
+       message(FATAL_ERROR "\n\nTo use GTNETS don't forget to set LD_LIBRARY_PATH with \n\texport LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${GTNETS_LIB_PATH}\n\n")
+endif(NOT operation)
+
+mark_as_advanced(HAVE_GTNETS_LIB)
+mark_as_advanced(HAVE_RNGSTREAM_H)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindGraphviz.cmake b/buildtools/Cmake/Modules/FindGraphviz.cmake
index fcb2ec5..5d89c8f 100644 (file)
--- a/buildtools/Cmake/Modules/FindGraphviz.cmake
+++ b/buildtools/Cmake/Modules/FindGraphviz.cmake
@@ -154,51 +154,51 @@ endif(HAVE_CDT_LIB)
 
 mark_as_advanced(HAVE_GRAPHVIZ)
 
-message("-- Looking for agraph.h")
+message(STATUS "Looking for agraph.h")
 if(HAVE_AGRAPH_H)
-message("-- Looking for agraph.h - found")
+message(STATUS "Looking for agraph.h - found")
 else(HAVE_AGRAPH_H)
-message("-- Looking for agraph.h - not found")
+message(STATUS "Looking for agraph.h - not found")
 endif(HAVE_AGRAPH_H)
 
-message("-- Looking for cgraph.h")
+message(STATUS "Looking for cgraph.h")
 if(HAVE_CGRAPH_H)
-message("-- Looking for cgraph.h - found")
+message(STATUS "Looking for cgraph.h - found")
 else(HAVE_CGRAPH_H)
-message("-- Looking for cgraph.h - not found")
+message(STATUS "Looking for cgraph.h - not found")
 endif(HAVE_CGRAPH_H)
 
-message("-- Looking for graph.h")
+message(STATUS "Looking for graph.h")
 if(HAVE_GRAPH_H)
-message("-- Looking for graph.h - found")
+message(STATUS "Looking for graph.h - found")
 else(HAVE_GRAPH_H)
-message("-- Looking for graph.h - not found")
+message(STATUS "Looking for graph.h - not found")
 endif(HAVE_GRAPH_H)
 
-message("-- Looking for lib agraph")
+message(STATUS "Looking for lib agraph")
 if(HAVE_AGRAPH_LIB)
-message("-- Looking for lib agraph - found")
+message(STATUS "Looking for lib agraph - found")
 else(HAVE_AGRAPH_LIB)
-message("-- Looking for lib agraph - not found")
+message(STATUS "Looking for lib agraph - not found")
 endif(HAVE_AGRAPH_LIB)
 
-message("-- Looking for lib cgraph")
+message(STATUS "Looking for lib cgraph")
 if(HAVE_CGRAPH_LIB)
-message("-- Looking for lib cgraph - found")
+message(STATUS "Looking for lib cgraph - found")
 else(HAVE_CGRAPH_LIB)
-message("-- Looking for lib cgraph - not found")
+message(STATUS "Looking for lib cgraph - not found")
 endif(HAVE_CGRAPH_LIB)
 
-message("-- Looking for lib graph")
+message(STATUS "Looking for lib graph")
 if(HAVE_GRAPH_LIB)
-message("-- Looking for lib graph - found")
+message(STATUS "Looking for lib graph - found")
 else(HAVE_GRAPH_LIB)
-message("-- Looking for lib graph - not found")
+message(STATUS "Looking for lib graph - not found")
 endif(HAVE_GRAPH_LIB)
 
-message("-- Looking for lib cdt")
+message(STATUS "Looking for lib cdt")
 if(HAVE_CDT_LIB)
-message("-- Looking for lib cdt - found")
+message(STATUS "Looking for lib cdt - found")
 else(HAVE_CDT_LIB)
-message("-- Looking for lib cdt - not found")
+message(STATUS "Looking for lib cdt - not found")
 endif(HAVE_CDT_LIB)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
index efe9316..749b7db 100644 (file)
--- a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
+++ b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
@@ -40,11 +40,11 @@ set(LUA_CPATH "$ENV{LUA_CPATH}")
 string(REGEX MATCH "${LIB_EXE}" LUA_CPATH "${LUA_CPATH}")
 
 if(LUA_CPATH AND APPLE)
-    message("-- LUA_CPATH have extension ${LIB_EXE}")
+    message(STATUS "LUA_CPATH have extension ${LIB_EXE}")
 else(DEFINED LUA_CPATH AND APPLE)
        if(APPLE)
-    message("-- Please set LUA_CPATH with extension ${LIB_EXE}")
-    message("-- For example, execute command line : export LUA_CPATH=\"./?.${LIB_EXE}\"")
+    message(STATUS "Please set LUA_CPATH with extension ${LIB_EXE}")
+    message(STATUS "For example, execute command line : export LUA_CPATH=\"./?.${LIB_EXE}\"")
     endif(APPLE)
 endif(LUA_CPATH AND APPLE)
 
@@ -57,21 +57,21 @@ mark_as_advanced(HAVE_LUA51_LIB)
 mark_as_advanced(HAVE_LUA_H)
 mark_as_advanced(HAVE_LUA_BIN)
 
-message("-- Looking for lua.h")
+message(STATUS "Looking for lua.h")
 if(HAVE_LUA_H)
-message("-- Looking for lua.h - found")
+message(STATUS "Looking for lua.h - found")
 else(HAVE_LUA_H)
-message("-- Looking for lua.h - not found")
+message(STATUS "Looking for lua.h - not found")
 endif(HAVE_LUA_H)
 
-message("-- Looking for lib lua")
+message(STATUS "Looking for lib lua")
 if(HAVE_LUA51_LIB)
-message("-- Looking for lib lua - found")
-message("-- Lib lua version: ${LIB_LUA_NAME}")
+message(STATUS "Looking for lib lua - found")
+message(STATUS "Lib lua version: ${LIB_LUA_NAME}")
 else(HAVE_LUA51_LIB)
-message("-- Looking for lib lua - not found")
+message(STATUS "Looking for lib lua - not found")
 endif(HAVE_LUA51_LIB)
 
 if(HAVE_LUA_BIN)
-message("-- Found Lua: ${HAVE_LUA_BIN}")
+message(STATUS "Found Lua: ${HAVE_LUA_BIN}")
 endif(HAVE_LUA_BIN)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index eac7742..7a7e6c2 100644 (file)
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -35,19 +35,19 @@ if(PATH_PCRE_LIB AND PATH_PCRE_H)
           endif(NOT operation)    
        set(HAVE_PCRE_LIB 1)
 else(PATH_PCRE_LIB)
-               message("-- Warning : You should install libpcre (please install the libpcre3-dev package or equivalent)")
+               message(STATUS "Warning : You should install libpcre (please install the libpcre3-dev package or equivalent)")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)
     
-message("-- Looking for pcre.h")
+message(STATUS "Looking for pcre.h")
 if(PATH_PCRE_H)
-message("-- Looking for pcre.h - found")
+message(STATUS "Looking for pcre.h - found")
 else(PATH_PCRE_H)
-message("-- Looking for pcre.h - not found")
+message(STATUS "Looking for pcre.h - not found")
 endif(PATH_PCRE_H)
 
-message("-- Looking for lib pcre")
+message(STATUS "Looking for lib pcre")
 if(PATH_PCRE_LIB)
-message("-- Looking for lib pcre - found")
+message(STATUS "Looking for lib pcre - found")
 else(PATH_PCRE_LIB)
-message("-- Looking for lib pcre - not found")
+message(STATUS "Looking for lib pcre - not found")
 endif(PATH_PCRE_LIB)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindRubySimgrid.cmake b/buildtools/Cmake/Modules/FindRubySimgrid.cmake
index 389a003..aaf092f 100644 (file)
--- a/buildtools/Cmake/Modules/FindRubySimgrid.cmake
+++ b/buildtools/Cmake/Modules/FindRubySimgrid.cmake
@@ -16,7 +16,7 @@ if(RUBY_LIBRARY)
                ADD_DEFINITIONS("-I${CMAKE_HOME_DIRECTORY}/src/bindings/ruby -I${CMAKE_HOME_DIRECTORY}/src/simix")
                SET(HAVE_RUBY 1)
        else(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
-               message("-- Warning : Ruby binding need version 1.9.x actually version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
+               message(STATUS "Warning : Ruby binding need version 1.9.x actually version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
                SET(HAVE_RUBY 0)
        endif(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
 else(RUBY_LIBRARY)
@@ -24,31 +24,31 @@ else(RUBY_LIBRARY)
 endif(RUBY_LIBRARY)
 
 if(NOT RUBY_EXECUTABLE)
-       message("-- Warning : you don't have ruby executable so you can compile and build examples but can't execute them!!!") 
+       message(STATUS "Warning : you don't have ruby executable so you can compile and build examples but can't execute them!!!") 
 endif(NOT RUBY_EXECUTABLE)
 
 if(RUBY_EXECUTABLE)
-       message("-- Found ruby: ${RUBY_EXECUTABLE}")
+       message(STATUS "Found ruby:     ${RUBY_EXECUTABLE}")
 endif(RUBY_EXECUTABLE)
 
-message("-- Looking for ruby.h")
+message(STATUS "Looking for ruby.h")
 if(RUBY_INCLUDE_DIR)
-message("-- Looking for ruby.h - found")
+message(STATUS "Looking for ruby.h - found")
 else(RUBY_INCLUDE_DIR)
-message("-- Looking for ruby.h - not found")
+message(STATUS "Looking for ruby.h - not found")
 endif(RUBY_INCLUDE_DIR)
 
-message("-- Looking for confi.h")
+message(STATUS "Looking for confi.h")
 if(RUBY_CONFIG_INCLUDE_DIR)
-message("-- Looking for config.h - found")
+message(STATUS "Looking for config.h - found")
 else(RUBY_CONFIG_INCLUDE_DIR)
-message("-- Looking for config.h - not found")
+message(STATUS "Looking for config.h - not found")
 endif(RUBY_CONFIG_INCLUDE_DIR)
 
-message("-- Looking for lib ruby")
+message(STATUS "Looking for lib ruby")
 if(RUBY_LIBRARY)
-message("-- Looking for lib ruby - found")
-message("-- Lib ruby version: ${LIB_RUBY_VERSION}")
+message(STATUS "Looking for lib ruby - found")
+message(STATUS "Lib ruby version: ${LIB_RUBY_VERSION}")
 else(RUBY_LIBRARY)
-message("-- Looking for lib ruby - not found")
+message(STATUS "Looking for lib ruby - not found")
 endif(RUBY_LIBRARY)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindSimGrid.cmake b/buildtools/Cmake/Modules/FindSimGrid.cmake
index 7b8a83e..9a1cf4f 100644 (file)
--- a/buildtools/Cmake/Modules/FindSimGrid.cmake
+++ b/buildtools/Cmake/Modules/FindSimGrid.cmake
@@ -63,24 +63,24 @@ find_program(HAVE_GRAS_STUB
        /usr
 )
 
-message("-- Looking for lib SimGrid")
+message(STATUS "Looking for lib SimGrid")
 if(HAVE_SIMGRID_LIB)
-message("-- Looking for lib SimGrid - found")
+message(STATUS "Looking for lib SimGrid - found")
 else(HAVE_SIMGRID_LIB)
-message("-- Looking for lib SimGrid - not found")
+message(STATUS "Looking for lib SimGrid - not found")
 endif(HAVE_SIMGRID_LIB)
 
-message("-- Looking for gras.h")
+message(STATUS "Looking for gras.h")
 if(HAVE_GRAS_H)
-message("-- Looking for gras.h - found")
+message(STATUS "Looking for gras.h - found")
 else(HAVE_GRAS_H)
-message("-- Looking for gras.h - not found")
+message(STATUS "Looking for gras.h - not found")
 endif(HAVE_GRAS_H)
 
 if(HAVE_TESH)
-message("-- Found Tesh: ${HAVE_TESH}")
+message(STATUS "Found Tesh: ${HAVE_TESH}")
 endif(HAVE_TESH)
 
 if(HAVE_GRAS_STUB)
-message("-- Found gras_stub_generator: ${HAVE_GRAS_STUB}")
+message(STATUS "Found gras_stub_generator: ${HAVE_GRAS_STUB}")
 endif(HAVE_GRAS_STUB)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindValgrind.cmake b/buildtools/Cmake/Modules/FindValgrind.cmake
index d64ccfa..22f1fe8 100644 (file)
--- a/buildtools/Cmake/Modules/FindValgrind.cmake
+++ b/buildtools/Cmake/Modules/FindValgrind.cmake
@@ -10,7 +10,7 @@ find_program(VALGRIND_EXE
 )
 
 if(VALGRIND_EXE)
-message("-- Found valgrind: ${VALGRIND_EXE}")
+message(STATUS "Found valgrind: ${VALGRIND_EXE}")
 SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
 SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
 endif(VALGRIND_EXE)
@@ -19,13 +19,13 @@ if(VALGRIND_EXE)
        exec_program("${VALGRIND_EXE} --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
        string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
        if(NEW_VALGRIND_VERSION)
-               message("-- Valgrind version: ${NEW_VALGRIND_VERSION}")
+               message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
                exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
                set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
-               message("-- Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
+               message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
        else(NEW_VALGRIND_VERSION)
                set(enable_memcheck false)
-               message("-- Error: Command valgrind not found --> enable_memcheck autoset to false.")
+               message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
        endif(NEW_VALGRIND_VERSION)
 else(VALGRIND_EXE)
        set(enable_memcheck false)

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 8b22ee2..1081c59 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -4,7 +4,6 @@
 
 
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
-set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib")
 
 set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag")
 

diff --git a/buildtools/Cmake/Pipol.cmake b/buildtools/Cmake/Pipol.cmake
index c56c23b..4f796f0 100644 (file)
--- a/buildtools/Cmake/Pipol.cmake
+++ b/buildtools/Cmake/Pipol.cmake
@@ -65,7 +65,7 @@ IF(pipol_user)
 
     MESSAGE(STATUS "Pipol user is ${pipol_user}")
     IF(HAVE_SSH)
-       message("-- Found ssh: ${HAVE_SSH}")
+       message(STATUS "Found ssh: ${HAVE_SSH}")
       # get pipol systems
       EXECUTE_PROCESS(COMMAND 
         ssh ${pipol_user}@pipol.inria.fr pipol-sub --query=systems 
@@ -90,7 +90,7 @@ IF(pipol_user)
                )
   
     IF(HAVE_RSYNC)
-       message("-- Found rsync: ${HAVE_RSYNC}")
+       message(STATUS "Found rsync: ${HAVE_RSYNC}")
              MACRO(PIPOL_TARGET
                  SYSTEM_PATTERN)
                                  STRING(REPLACE ".dd.gz" "" SYSTEM_TARGET ${SYSTEM_PATTERN})
@@ -168,6 +168,6 @@ ADD_CUSTOM_TARGET(pipol_kill_all_jobs
                COMMAND ./pipol-sub --pipol-user=${pipol_user} deleteallmyjobs
                )
                
-message("-- Pipol options: ${CMAKE_OPTIONS}")
+message(STATUS "Pipol options: ${CMAKE_OPTIONS}")
                
 ENDIF(pipol_user)
\ No newline at end of file

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 669e4a0..9118fb5 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -106,7 +106,6 @@ message("")
 message("      Context backend:        ${with_context}")
 if(NOT APPLE AND NOT WIN32)
 message("      Compile Gtnets :        ${HAVE_GTNETS}")
-message("      Gtnets path    :        ${gtnets_path}")
 endif(NOT APPLE AND NOT WIN32)
 message("      Compile Java   :        ${HAVE_JAVA}")
 message("      Compile Lua    :        ${HAVE_LUA}")