Cosmetics

[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake

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
 )
 
 ${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)
 
 include(CheckFunctionExists)
 include(CheckIncludeFile)


@@ -14,6 +14,9 @@ TEST_BIG_ENDIAN(BIGENDIAN)
 
 include(FindGraphviz)
 include(FindPCRE)
 
 include(FindGraphviz)
 include(FindPCRE)

+if(enable_gtnets)      
+       include(FindGTnets)
+endif(enable_gtnets)

 if(enable_ruby)
        include(FindRubySimgrid)        
 endif(enable_ruby)
 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)
        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)
     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)
                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)
 
        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)
                        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)
 
        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
 
 #--------------------------------------------------------------------------------------------------
 ### 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")
 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")
 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")
        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")
                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")
                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")
 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)
 endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
 
 if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)