Cosmetics.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29e9a43..5f9116c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,11 @@ endif(NOT PERL_EXECUTABLE)
 if(APPLE)
        set(LIB_EXE "dylib")
 else(APPLE)
-       set(LIB_EXE "so")
+    if(WIN32)
+        set(LIB_EXE "a")
+    else(WIN32)
+           set(LIB_EXE "so")
+    endif(WIN32)
 endif(APPLE)
 
 ### Set some variables for Cmake
@@ -125,20 +129,18 @@ if(WIN32)
     
     set(_XBT_WIN32 1)
     
-    message("Be sure all those variables are correctely set.")
-    message("  -- C_COMPILER                   $ENV{CC}")
-    message("  -- CXX_COMPILER                 $ENV{CXX}")    
-    message("  -- INCLUDE                      $ENV{INCLUDE}")
-    message("  -- LIB                          $ENV{LIB}")
-    message("  -- MAKE_PROGRAM                 ${CMAKE_MAKE_PROGRAM}")
-    message("  -- CMAKE_BUILD_TOOL             ${CMAKE_BUILD_TOOL}")
-    message("  -- LINKER                       ${CMAKE_LINKER}")
-    message("  -- CMAKE_GENERATOR              ${CMAKE_GENERATOR}")
-    message("  -- INCLUDES                     ${INCLUDES}")
-    message("  -- BORLAND                      ${BORLAND}")
-    message("  -- VISUALC                      ${MSVC}")
-    message("  -- GNUC                         ${CMAKE_COMPILER_IS_GNUCC}\n\n")
-    
+    message(STATUS "C_COMPILER                 $ENV{CC}")
+    message(STATUS "CXX_COMPILER                       $ENV{CXX}")    
+    message(STATUS "INCLUDE                    $ENV{INCLUDE}")
+    message(STATUS "LIB                                $ENV{LIB}")
+    message(STATUS "MAKE_PROGRAM                       ${CMAKE_MAKE_PROGRAM}")
+    message(STATUS "CMAKE_BUILD_TOOL           ${CMAKE_BUILD_TOOL}")
+    message(STATUS "LINKER                     ${CMAKE_LINKER}")
+    message(STATUS "CMAKE_GENERATOR            ${CMAKE_GENERATOR}")
+    message(STATUS "BORLAND                    ${BORLAND}")
+    message(STATUS "VISUALC                    ${MSVC}")
+    message(STATUS "GNUC                               ${CMAKE_COMPILER_IS_GNUCC}")
+   
 endif(WIN32)
 
 include_directories(${INCLUDES})
@@ -159,17 +161,22 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake)
 
 ### Build some Maintainer files
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
+if(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/UnitTesting.cmake)
+endif(NOT WIN32)
 
 ### Setup gcc flags
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Flags.cmake)
 
-### Make Libs and Exes
-if(WIN32)
-    include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExeLibWin.cmake)
-else(WIN32)
-    include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake)
-endif(WIN32)
+### Make Libs
+if(NOT WIN32)
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLib.cmake)
+else(NOT WIN32)
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLibWin.cmake)
+endif(NOT WIN32)
+
+### Make Exes
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
 
 ### Make Simgrid.jar and Java examples
 if(HAVE_JAVA)
@@ -180,7 +187,7 @@ endif(HAVE_JAVA)
 if(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
 else(NOT WIN32)
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTestsWin.cmake)
+
 endif(NOT WIN32)
 
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
@@ -191,9 +198,10 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 ### Pipol compilation
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
 
+if(NOT WIN32)
 ### Build the doc
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
-
+endif(NOT WIN32)
 ### Print ARGS
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
 

diff --git a/buildtools/Cmake/MakeExeLibWin.cmake b/buildtools/Cmake/MakeExe.cmake
similarity index 66%
rename from buildtools/Cmake/MakeExeLibWin.cmake
rename to buildtools/Cmake/MakeExe.cmake
index 7977a06..864e231 100644 (file)
--- a/buildtools/Cmake/MakeExeLibWin.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -1,53 +1,24 @@
-### Make Libs\r
-#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32        \r
-add_library(simgrid STATIC ${simgrid_sources})\r
-add_library(gras STATIC ${gras_sources})\r
-\r
-if(MSVC)\r
-    set_target_properties(gras     PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
-                                                     OUTPUT_NAME   "gras")\r
-    set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
-                                                     OUTPUT_NAME   "simgrid")\r
-else(MSVC)\r
-    if(CMAKE_COMPILER_IS_GNUCC)\r
-        set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"\r
-                                                         OUTPUT_NAME   "gras")\r
-        set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"\r
-                                                         OUTPUT_NAME   "simgrid")\r
-    else(CMAKE_COMPILER_IS_GNUCC)\r
-        message(FATAL_ERROR "Compilateur non connu!!!")\r
-    endif(CMAKE_COMPILER_IS_GNUCC)\r
-endif(MSVC)\r
-\r
-set(GRAS_DEP "wsock32")\r
-set(SIMGRID_DEP "wsock32")\r
-\r
-target_link_libraries(simgrid  ${SIMGRID_DEP})\r
-target_link_libraries(gras     ${GRAS_DEP})\r
-\r
-### Make EXEs\r
-\r
-#src/testall\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/src)\r
-\r
-#tools/gras\r
+###################################################################\r
+### Load all files declaring binaries (tools, examples and tests) #\r
+###################################################################\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)\r
 \r
-#tools/tesh\r
-#add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)\r
+if(WIN32)\r
+       add_custom_target(tesh ALL\r
+       DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl\r
+       COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl"\r
+       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh\r
+       )\r
+else(WIN32)\r
+       add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)\r
+endif(WIN32)\r
 \r
-#testsuite/xbt\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)\r
 \r
-#testsuite/surf\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)\r
-\r
-#testsuite/simdag\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/simdag)\r
-\r
-#teshsuite\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)\r
-#add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc)\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/small_sleep)\r
@@ -59,7 +30,6 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)\r
 \r
-#examples\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/ping)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/rpc)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/spawn)\r
@@ -105,6 +75,7 @@ endif(HAVE_GRAPHVIZ)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/metaxml)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties)\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling)\r
+\r
 if(enable_smpi)\r
        add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi)\r
 endif(enable_smpi)\r

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeLib.cmake
similarity index 61%
rename from buildtools/Cmake/MakeExeLib.cmake
rename to buildtools/Cmake/MakeLib.cmake
index bd53502..a1fb29c 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -162,86 +162,4 @@ if(enable_lib_static)
                target_link_libraries(smpi_static       simgrid ${SMPI_LDEP})
                set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi)
        endif(enable_smpi)
-endif(enable_lib_static)
-
-###################################################################
-### Load all files declaring binaries (tools, examples and tests) #
-###################################################################
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)
-
-if(WIN32)
-       add_custom_target(tesh ALL
-       DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
-       COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl"
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
-       )
-else(WIN32)
-       add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
-endif(WIN32)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/small_sleep)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/ping)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/rpc)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/spawn)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/timer)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/chrono)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/all2all)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/pmm)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/synchro)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/properties)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/console)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/properties)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/actions)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/migration)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/suspend)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/priority)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/trace)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/icomms)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chord)
-
-if(HAVE_MC)
-       add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc)
-endif(HAVE_MC)
-
-if(HAVE_GTNETS)
-       add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)
-endif(HAVE_GTNETS)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/saturate)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dax)
-if(HAVE_GRAPHVIZ)
-  add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot)
-endif(HAVE_GRAPHVIZ)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/metaxml)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling)
-
-if(enable_smpi)
-       add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi)
-endif(enable_smpi)
+endif(enable_lib_static)
\ No newline at end of file

diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake
new file mode 100644 (file)
index 0000000..733f6ca
--- /dev/null
+++ b/buildtools/Cmake/MakeLibWin.cmake
@@ -0,0 +1,30 @@
+### Make Libs\r
+#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32        \r
+add_library(simgrid STATIC ${simgrid_sources})\r
+add_library(gras STATIC ${gras_sources})\r
+\r
+if(MSVC)\r
+    set_target_properties(gras     PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
+                                                     OUTPUT_NAME   "gras")\r
+    set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
+                                                     OUTPUT_NAME   "simgrid")\r
+else(MSVC)\r
+    if(CMAKE_COMPILER_IS_GNUCC)\r
+        set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"\r
+                                                         OUTPUT_NAME   "gras")\r
+        set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"\r
+                                                         OUTPUT_NAME   "simgrid")\r
+    else(CMAKE_COMPILER_IS_GNUCC)\r
+        message(FATAL_ERROR "Compilateur non connu!!!")\r
+    endif(CMAKE_COMPILER_IS_GNUCC)\r
+endif(MSVC)\r
+\r
+set(GRAS_DEP "wsock32")\r
+set(SIMGRID_DEP "wsock32")\r
+\r
+if(HAVE_PCRE_LIB)\r
+       SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre")\r
+endif(HAVE_PCRE_LIB)\r
+\r
+target_link_libraries(simgrid  ${SIMGRID_DEP})\r
+target_link_libraries(gras     ${GRAS_DEP})\r