Cosmetics.

[simgrid.git] / buildtools / Cmake / MakeExe.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
 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
 \r

-#testsuite/xbt\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)\r

 \r
 \r

-#testsuite/surf\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)\r

 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)\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/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
 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
 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
 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
 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
 if(enable_smpi)\r
        add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi)\r
 endif(enable_smpi)\r