From 01229eb154b0c1264a6406b673e8ed18126da812 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 18 Jan 2011 14:38:50 +0000 Subject: [PATCH] Cosmetics. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9435 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 54 +++++++----- .../{MakeExeLibWin.cmake => MakeExe.cmake} | 61 ++++---------- .../Cmake/{MakeExeLib.cmake => MakeLib.cmake} | 84 +------------------ buildtools/Cmake/MakeLibWin.cmake | 30 +++++++ 4 files changed, 78 insertions(+), 151 deletions(-) rename buildtools/Cmake/{MakeExeLibWin.cmake => MakeExe.cmake} (66%) rename buildtools/Cmake/{MakeExeLib.cmake => MakeLib.cmake} (61%) create mode 100644 buildtools/Cmake/MakeLibWin.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 29e9a435c2..5f9116c18f 100644 --- 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 7977a060fd..864e231433 100644 --- a/buildtools/Cmake/MakeExeLibWin.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -1,53 +1,24 @@ -### Make Libs -#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32 -add_library(simgrid STATIC ${simgrid_sources}) -add_library(gras STATIC ${gras_sources}) - -if(MSVC) - set_target_properties(gras PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC" - OUTPUT_NAME "gras") - set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC" - OUTPUT_NAME "simgrid") -else(MSVC) - if(CMAKE_COMPILER_IS_GNUCC) - set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC" - OUTPUT_NAME "gras") - set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC" - OUTPUT_NAME "simgrid") - else(CMAKE_COMPILER_IS_GNUCC) - message(FATAL_ERROR "Compilateur non connu!!!") - endif(CMAKE_COMPILER_IS_GNUCC) -endif(MSVC) - -set(GRAS_DEP "wsock32") -set(SIMGRID_DEP "wsock32") - -target_link_libraries(simgrid ${SIMGRID_DEP}) -target_link_libraries(gras ${GRAS_DEP}) - -### Make EXEs - -#src/testall -add_subdirectory(${CMAKE_HOME_DIRECTORY}/src) - -#tools/gras +################################################################### +### Load all files declaring binaries (tools, examples and tests) # +################################################################### add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras) -#tools/tesh -#add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh) +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) -#testsuite/xbt -add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/) -#testsuite/surf +add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt) add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf) - -#testsuite/simdag -add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/simdag) - -#teshsuite add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt) -#add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc) +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) @@ -59,7 +30,6 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg) -#examples add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/ping) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/rpc) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/spawn) @@ -105,6 +75,7 @@ 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) 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 bd53502a51..a1fb29c823 100644 --- 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 index 0000000000..733f6ca075 --- /dev/null +++ b/buildtools/Cmake/MakeLibWin.cmake @@ -0,0 +1,30 @@ +### Make Libs +#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32 +add_library(simgrid STATIC ${simgrid_sources}) +add_library(gras STATIC ${gras_sources}) + +if(MSVC) + set_target_properties(gras PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC" + OUTPUT_NAME "gras") + set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC" + OUTPUT_NAME "simgrid") +else(MSVC) + if(CMAKE_COMPILER_IS_GNUCC) + set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC" + OUTPUT_NAME "gras") + set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC" + OUTPUT_NAME "simgrid") + else(CMAKE_COMPILER_IS_GNUCC) + message(FATAL_ERROR "Compilateur non connu!!!") + endif(CMAKE_COMPILER_IS_GNUCC) +endif(MSVC) + +set(GRAS_DEP "wsock32") +set(SIMGRID_DEP "wsock32") + +if(HAVE_PCRE_LIB) + SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre") +endif(HAVE_PCRE_LIB) + +target_link_libraries(simgrid ${SIMGRID_DEP}) +target_link_libraries(gras ${GRAS_DEP}) -- 2.20.1