From c5c1970d1789e6fd9ca264d279a86abd8621bd5d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christophe=20Thi=C3=A9ry?= Date: Thu, 25 Oct 2012 18:10:01 +0200 Subject: [PATCH 1/1] Since cmake 2.6, else() and endif() don't need to repeat the condition. And all CMakeLists.txt already require a version of cmake >= 2.6. --- CMakeLists.txt | 56 ++-- buildtools/Cmake/AddTests.cmake | 124 ++++----- buildtools/Cmake/CTestConfig.cmake | 20 +- buildtools/Cmake/CompleteInFiles.cmake | 254 +++++++++--------- buildtools/Cmake/DefinePackages.cmake | 32 +-- buildtools/Cmake/Distrib.cmake | 22 +- buildtools/Cmake/Flags.cmake | 32 +-- buildtools/Cmake/GenerateDevGuide.cmake | 4 +- buildtools/Cmake/GenerateDoc.cmake | 22 +- buildtools/Cmake/GenerateDocWin.cmake | 4 +- buildtools/Cmake/GenerateRefGuide.cmake | 4 +- buildtools/Cmake/GenerateUserGuide.cmake | 4 +- buildtools/Cmake/MaintainerMode.cmake | 18 +- buildtools/Cmake/MakeLib.cmake | 60 ++--- buildtools/Cmake/MakeLibWin.cmake | 12 +- buildtools/Cmake/Modules/FindF2c.cmake | 24 +- buildtools/Cmake/Modules/FindGTnets.cmake | 20 +- buildtools/Cmake/Modules/FindGraphviz.cmake | 50 ++-- buildtools/Cmake/Modules/FindLibunwind.cmake | 16 +- .../Cmake/Modules/FindLua51Simgrid.cmake | 18 +- buildtools/Cmake/Modules/FindNS3.cmake | 32 +-- buildtools/Cmake/Modules/FindPCRE.cmake | 12 +- buildtools/Cmake/Modules/FindPcreWin.cmake | 14 +- buildtools/Cmake/Modules/FindRngStream.cmake | 12 +- .../Cmake/Modules/FindRubySimgrid.cmake | 28 +- buildtools/Cmake/Modules/FindSimGrid.cmake | 12 +- buildtools/Cmake/Modules/FindValgrind.cmake | 10 +- buildtools/Cmake/Option.cmake | 8 +- buildtools/Cmake/Pipol.cmake | 32 +-- buildtools/Cmake/PrintArgs.cmake | 4 +- buildtools/Cmake/Supernovae.cmake | 2 +- buildtools/Cmake/UnitTesting.cmake | 4 +- buildtools/pipol/CtestPipol.cmake | 12 +- doc/HelloWorld/CMakeLists.txt | 8 +- doc/HelloWorld/FindPcreWin.cmake | 14 +- examples/amok/bandwidth/CMakeLists.txt | 4 +- examples/amok/saturate/CMakeLists.txt | 4 +- examples/gras/all2all/CMakeLists.txt | 4 +- examples/gras/chrono/CMakeLists.txt | 4 +- examples/gras/console/CMakeLists.txt | 2 +- examples/gras/mmrpc/CMakeLists.txt | 4 +- .../simple_token/CMakeLists.txt | 4 +- examples/gras/ping/CMakeLists.txt | 4 +- examples/gras/pmm/CMakeLists.txt | 4 +- examples/gras/properties/CMakeLists.txt | 4 +- examples/gras/rpc/CMakeLists.txt | 4 +- examples/gras/spawn/CMakeLists.txt | 4 +- examples/gras/synchro/CMakeLists.txt | 4 +- examples/gras/timer/CMakeLists.txt | 4 +- examples/msg/cloud/CMakeLists.txt | 4 +- examples/msg/io/CMakeLists.txt | 4 +- examples/msg/masterslave/CMakeLists.txt | 4 +- examples/msg/mc/CMakeLists.txt | 2 +- examples/msg/ns3/CMakeLists.txt | 2 +- examples/msg/start_kill_time/CMakeLists.txt | 4 +- examples/msg/token_ring/CMakeLists.txt | 4 +- examples/msg/tracing/CMakeLists.txt | 2 +- examples/simdag/CMakeLists.txt | 4 +- examples/simdag/dax/CMakeLists.txt | 4 +- examples/simdag/dot/CMakeLists.txt | 6 +- examples/simdag/goal/CMakeLists.txt | 4 +- examples/simdag/metaxml/CMakeLists.txt | 4 +- examples/simdag/properties/CMakeLists.txt | 4 +- examples/simdag/scheduling/CMakeLists.txt | 4 +- examples/smpi/CMakeLists.txt | 2 +- examples/smpi/MM/CMakeLists.txt | 6 +- teshsuite/gras/datadesc/CMakeLists.txt | 2 +- teshsuite/gras/empty_main/CMakeLists.txt | 4 +- teshsuite/gras/msg_handle/CMakeLists.txt | 4 +- teshsuite/gras/numerous_rpc/CMakeLists.txt | 4 +- teshsuite/gras/small_sleep/CMakeLists.txt | 4 +- teshsuite/msg/CMakeLists.txt | 4 +- teshsuite/simdag/CMakeLists.txt | 4 +- teshsuite/simdag/network/CMakeLists.txt | 4 +- teshsuite/simdag/network/mxn/CMakeLists.txt | 4 +- teshsuite/simdag/network/p2p/CMakeLists.txt | 4 +- teshsuite/simdag/partask/CMakeLists.txt | 4 +- teshsuite/simdag/platforms/CMakeLists.txt | 4 +- teshsuite/smpi/CMakeLists.txt | 2 +- teshsuite/xbt/CMakeLists.txt | 10 +- testsuite/surf/CMakeLists.txt | 4 +- testsuite/xbt/CMakeLists.txt | 4 +- tools/graphicator/CMakeLists.txt | 4 +- tools/gras/CMakeLists.txt | 4 +- tools/tesh/CMakeLists.txt | 4 +- 85 files changed, 598 insertions(+), 598 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35a0e3b63b..3da52d4d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) ### Need to set rc ccompiler before enable language if(WIN32) SET(CMAKE_RC_COMPILER "windres") -endif(WIN32) +endif() project(SimGrid CXX C) set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE) @@ -25,9 +25,9 @@ set(SIMGRID_VERSION_PATCH "0") if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") -else(${SIMGRID_VERSION_PATCH} EQUAL "0") +else() set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}") -endif(${SIMGRID_VERSION_PATCH} EQUAL "0") +endif() set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") set(libsmpi_version "${release_version}") @@ -37,14 +37,14 @@ set(APPLE_NEED_GCC_VERSION "4.6") ### SET THE LIBRARY EXTENSION AND GCC VERSION if(APPLE) #MAC set(LIB_EXE "dylib") -else(APPLE) +else() if(WIN32) #WINDOWS set(LIB_EXE "a") set(BIN_EXE ".exe") - else(WIN32) #UNIX + else() #UNIX set(LIB_EXE "so") - endif(WIN32) -endif(APPLE) + endif() +endif() string(REGEX MATCH "gcc" GCC "${CMAKE_C_COMPILER}") if(GCC) @@ -58,20 +58,20 @@ if(GCC) if(${GCC_NEED_VERSION} GREATER COMPILER_C_VERSION_MAJOR_MINOR) message(FATAL_ERROR "Gcc must be to version ${GCC_NEED_VERSION} current version ${COMPILER_C_VERSION_MAJOR_MINOR}") - endif(${GCC_NEED_VERSION} GREATER COMPILER_C_VERSION_MAJOR_MINOR) -endif(GCC) + endif() +endif() string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}") if(VBC) message(FATAL_ERROR "VB is not yet supported by Simgrid.") -endif(VBC) +endif() ### Find programs and paths FIND_PROGRAM(GCOV_PATH gcov) include(FindPerl) if(NOT PERL_EXECUTABLE) message(FATAL_ERROR "-- SimGrid cannot be compiled without Perl installed -- sorry. Bailling out.") -endif(NOT PERL_EXECUTABLE) +endif() ### Set some variables for Cmake SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) @@ -88,21 +88,21 @@ set(INCLUDES if(WIN32) set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch] -endif(WIN32) +endif() set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY}) if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/) set(INCLUDES ${INCLUDES} /usr/include/) -endif(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/) +endif() ### Check 32bits or 64bits INCLUDE (CheckTypeSize) CHECK_TYPE_SIZE("void*" SIZEOF_VOIDSTAR) IF(SIZEOF_VOIDSTAR EQUAL 4) SET(ARCH_32_BITS 1) -ELSE(SIZEOF_VOIDSTAR EQUAL 4) +ELSE() SET(ARCH_32_BITS 0) -ENDIF(SIZEOF_VOIDSTAR EQUAL 4) +ENDIF() if(WIN32) @@ -122,26 +122,26 @@ if(WIN32) string(REGEX REPLACE "^${COMPILER_C_MAJOR_VERSION}." "" COMPILER_C_MINOR_VERSION "${COMPILER_C_MINOR_VERSION}") if(COMPILER_C_MAJOR_VERSION) # set(__GNUC__ ${COMPILER_C_MAJOR_VERSION}) - endif(COMPILER_C_MAJOR_VERSION) + endif() if(COMPILER_C_MINOR_VERSION) # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION}) - endif(COMPILER_C_MINOR_VERSION) + endif() set(MSVC 0) set(BORLAND 0) - else(CMAKE_COMPILER_IS_GNUCC) + else() message(FATAL_ERROR "Please use MinGW to compile SimGrid!") - endif(CMAKE_COMPILER_IS_GNUCC) + endif() if(ARCH_32_BITS) ### Arch 32bits set(_WIN32 1) - else(ARCH_32_BITS) ### Arch 64bits + else() ### Arch 64bits set(_WIN64 1) - endif(ARCH_32_BITS) + endif() set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432}) if(NSIS_WIN_VERSION MATCHES "") set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE}) - endif(NSIS_WIN_VERSION MATCHES "") + endif() string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION) set(_XBT_WIN32 1) @@ -159,7 +159,7 @@ if(WIN32) message(STATUS "VISUALC ${MSVC}") message(STATUS "GNUC ${CMAKE_COMPILER_IS_GNUCC}") -endif(WIN32) +endif() include_directories(${INCLUDES}) @@ -180,7 +180,7 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake) include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake) if(NOT WIN32) include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/UnitTesting.cmake) -endif(NOT WIN32) +endif() ### Setup gcc flags include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Flags.cmake) @@ -188,9 +188,9 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Flags.cmake) ### Make Libs if(NOT WIN32) include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLib.cmake) -else(NOT WIN32) +else() include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLibWin.cmake) -endif(NOT WIN32) +endif() ### Make Exes include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake) @@ -208,9 +208,9 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake) ### Build the doc if(NOT WIN32) include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake) -else(NOT WIN32) +else() include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake) -endif(NOT WIN32) +endif() ### Print ARGS include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index f96df3b44e..b70333d7c9 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -1,14 +1,14 @@ if(enable_memcheck) include(FindValgrind) -endif(enable_memcheck) +endif() if(enable_smpi AND NOT WIN32) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE "OKITOKI") exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE "OKITOKI") exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI") exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI") -endif(enable_smpi AND NOT WIN32) +endif() ### For code coverage ### Set some variables @@ -53,10 +53,10 @@ if(NOT enable_memcheck) IF(HAVE_MMAP) IF(${ARCH_32_BITS}) ADD_TEST(xbt-mmalloc-32 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc_32.tesh) - ELSE(${ARCH_32_BITS}) + ELSE() ADD_TEST(xbt-mmalloc-64 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc_64.tesh) - ENDIF(${ARCH_32_BITS}) - ENDIF(HAVE_MMAP) + ENDIF() + ENDIF() # teshsuite/gras/datadesc directory ADD_TEST(tesh-gras-dd-mem ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_mem.tesh) @@ -67,18 +67,18 @@ if(NOT enable_memcheck) IF(${ARCH_32_BITS}) ADD_TEST(tesh-gras-msg-handle-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_32.tesh) - ELSE(${ARCH_32_BITS}) + ELSE() ADD_TEST(tesh-gras-msg-handle-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_64.tesh) - ENDIF(${ARCH_32_BITS}) + ENDIF() ADD_TEST(tesh-gras-empty-main-rl ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_rl.tesh) ADD_TEST(tesh-gras-empty-main-sg ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_sg.tesh) IF(${ARCH_32_BITS}) ADD_TEST(tesh-gras-small-sleep-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32.tesh) - ELSE(${ARCH_32_BITS}) + ELSE() ADD_TEST(tesh-gras-small-sleep-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64.tesh) - ENDIF(${ARCH_32_BITS}) + ENDIF() # GRAS examples ADD_TEST(gras-ping-rl ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_rl.tesh) @@ -97,14 +97,14 @@ if(NOT enable_memcheck) ADD_TEST(tesh-msg-get-sender-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh) if(HAVE_RAWCTX) ADD_TEST(tesh-msg-get-sender-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh) - endif(HAVE_RAWCTX) + endif() if(CONTEXT_UCONTEXT) ADD_TEST(tesh-msg-get-sender-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh) - endif(CONTEXT_UCONTEXT) + endif() IF(enable_debug) # these tests need the assertion mechanism ADD_TEST(tesh-simdag-parser-bogus-symmetric ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh) - ENDIF(enable_debug) + ENDIF() ADD_TEST(tesh-simdag-bypass ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh) ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) @@ -177,7 +177,7 @@ if(NOT enable_memcheck) ADD_TEST(msg-masterslave-failure-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh) ADD_TEST(msg-masterslave-mailbox-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh) ADD_TEST(msg-masterslave-cpu-ti-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(msg-sendrecv-CLM03-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh) @@ -198,18 +198,18 @@ if(NOT enable_memcheck) ADD_TEST(msg-masterslave-failure-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh) ADD_TEST(msg-masterslave-mailbox-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh) ADD_TEST(msg-masterslave-cpu-ti-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh) - endif(HAVE_RAWCTX) + endif() ADD_TEST(msg-masterslave-vivaldi-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh) ADD_TEST(msg-token-ring-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh) if(HAVE_RAWCTX) ADD_TEST(msg-masterslave-vivaldi-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh) ADD_TEST(msg-token-ring-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh) - endif(HAVE_RAWCTX) + endif() if(CONTEXT_UCONTEXT) ADD_TEST(msg-masterslave-vivaldi-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh) ADD_TEST(msg-token-ring-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh) - endif(CONTEXT_UCONTEXT) + endif() ADD_TEST(msg-migration-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh) ADD_TEST(msg-ptask-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh) @@ -244,7 +244,7 @@ if(NOT enable_memcheck) ADD_TEST(msg-kademlia-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia kademlia.tesh) ADD_TEST(msg-kademlia-ucontext-parallel ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/nthreads:4 --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia kademlia.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(msg-migration-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh) ADD_TEST(msg-ptask-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh) @@ -261,7 +261,7 @@ if(NOT enable_memcheck) ADD_TEST(msg-bittorrent-raw-parallel ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/nthreads:4 --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/bittorrent --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent bittorrent.tesh) ADD_TEST(msg-kademlia-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia kademlia.tesh) ADD_TEST(msg-kademlia-raw-parallel ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/nthreads:4 --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia kademlia.tesh) - endif(HAVE_RAWCTX) + endif() IF(${ARCH_32_BITS}) ADD_TEST(gras-ping-sg-32-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh) @@ -285,7 +285,7 @@ if(NOT enable_memcheck) ADD_TEST(gras-all2all-sg-32-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh) ADD_TEST(gras-pmm-sg-32-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh) ADD_TEST(gras-synchro-sg-32-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(gras-ping-sg-32-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh) ADD_TEST(gras-rpc-sg-32-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh) @@ -297,9 +297,9 @@ if(NOT enable_memcheck) ADD_TEST(gras-all2all-sg-32-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh) ADD_TEST(gras-pmm-sg-32-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh) ADD_TEST(gras-synchro-sg-32-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh) - endif(HAVE_RAWCTX) + endif() - ELSE(${ARCH_32_BITS}) + ELSE() ADD_TEST(gras-ping-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh) ADD_TEST(gras-rpc-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh) ADD_TEST(gras-spawn-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh) @@ -321,7 +321,7 @@ if(NOT enable_memcheck) ADD_TEST(gras-all2all-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh) ADD_TEST(gras-pmm-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh) ADD_TEST(gras-synchro-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(gras-ping-sg-64-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh) ADD_TEST(gras-rpc-sg-64-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh) @@ -333,16 +333,16 @@ if(NOT enable_memcheck) ADD_TEST(gras-all2all-sg-64-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh) ADD_TEST(gras-pmm-sg-64-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh) ADD_TEST(gras-synchro-sg-64-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh) - endif(HAVE_RAWCTX) + endif() - ENDIF(${ARCH_32_BITS}) + ENDIF() ADD_TEST(gras-properties-sg-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh) if(CONTEXT_UCONTEXT) ADD_TEST(gras-properties-sg-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(gras-properties-sg-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh) - endif(HAVE_RAWCTX) + endif() # amok examples ADD_TEST(amok-bandwidth-rl ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_rl.tesh) @@ -354,28 +354,28 @@ if(NOT enable_memcheck) if(HAVE_RAWCTX) ADD_TEST(amok-bandwidth-sg-32-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh) ADD_TEST(amok-saturate-sg-32-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh) - endif(HAVE_RAWCTX) + endif() if(CONTEXT_UCONTEXT) ADD_TEST(amok-bandwidth-sg-32-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh) ADD_TEST(amok-saturate-sg-32-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh) - endif(CONTEXT_UCONTEXT) - ELSE(${ARCH_32_BITS}) + endif() + ELSE() ADD_TEST(amok-bandwidth-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh) ADD_TEST(amok-saturate-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh) if(HAVE_RAWCTX) ADD_TEST(amok-bandwidth-sg-64-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh) ADD_TEST(amok-saturate-sg-64-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh) - endif(HAVE_RAWCTX) + endif() if(CONTEXT_UCONTEXT) ADD_TEST(amok-saturate-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh) ADD_TEST(amok-bandwidth-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh) - endif(CONTEXT_UCONTEXT) - ENDIF(${ARCH_32_BITS}) + endif() + ENDIF() # simdag examples if(HAVE_GRAPHVIZ) ADD_TEST(simdag-test-dotload ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/test_simdag_dotload.tesh) - endif(HAVE_GRAPHVIZ) + endif() ADD_TEST(simdag-test-simdag ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag.tesh) ADD_TEST(simdag-test-simdag2 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag2.tesh) ADD_TEST(simdag-test-seq-access ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_seq_access.tesh) @@ -390,10 +390,10 @@ if(NOT enable_memcheck) ADD_TEST(msg-gtnets-crosstraffic-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) if(CONTEXT_UCONTEXT) ADD_TEST(msg-gtnets-crosstraffic-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(msg-gtnets-crosstraffic-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) - endif(HAVE_RAWCTX) + endif() if(HAVE_GTNETS) ADD_TEST(msg-gtnets-waxman-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh) @@ -407,14 +407,14 @@ if(NOT enable_memcheck) ADD_TEST(msg-gtnets-onelink-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh) ADD_TEST(msg-gtnets-dogbone-lv08-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh) ADD_TEST(msg-gtnets-onelink-lv08-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(msg-gtnets-waxman-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh) ADD_TEST(msg-gtnets-dogbone-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh) ADD_TEST(msg-gtnets-onelink-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh) ADD_TEST(msg-gtnets-dogbone-lv08-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh) ADD_TEST(msg-gtnets-onelink-lv08-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh) - endif(HAVE_RAWCTX) + endif() if(HAVE_TRACING) ADD_TEST(msg-tracing-gtnets-waxman ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-waxman.tesh) @@ -422,14 +422,14 @@ if(NOT enable_memcheck) ADD_TEST(msg-tracing-gtnets-onelink ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh) ADD_TEST(msg-tracing-gtnets-dogbone-lv08 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh) ADD_TEST(msg-tracing-gtnets-onelink-lv08 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh) - endif(HAVE_TRACING) - endif(HAVE_GTNETS) + endif() + endif() if(HAVE_NS3) ADD_TEST(msg-ns3-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh) ADD_TEST(msg-ns3-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh) ADD_TEST(msg-ns3-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh) - endif(HAVE_NS3) + endif() IF(HAVE_TRACING) ADD_TEST(tracing-help ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-tracing) @@ -442,7 +442,7 @@ if(NOT enable_memcheck) ADD_TEST(tracing-categories ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh) ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh) ADD_TEST(graphicator ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh) - ENDIF(HAVE_TRACING) + ENDIF() # Lua examples if(HAVE_LUA) @@ -464,7 +464,7 @@ if(NOT enable_memcheck) set_tests_properties(lua-bittorrent PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-kademlia PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(simdag-test-lua PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") - endif(HAVE_LUA) + endif() # END TESH TESTS @@ -485,7 +485,7 @@ if(NOT enable_memcheck) ADD_TEST(smpi-struct-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct.tesh) ADD_TEST(smpi-pt2pt-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pt2pt.tesh) - endif(HAVE_RAWCTX) + endif() if(CONTEXT_UCONTEXT) ADD_TEST(smpi-bcast-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast.tesh) ADD_TEST(smpi-reduce-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce.tesh) @@ -494,12 +494,12 @@ if(NOT enable_memcheck) ADD_TEST(smpi-struct-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct.tesh) ADD_TEST(smpi-pt2pt-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pt2pt.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_TRACING) ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh) ADD_TEST(smpi-replay ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/smpi_replay.tesh) - endif(HAVE_TRACING) - endif(enable_smpi) + endif() + endif() # examples/msg/mc if(HAVE_MC) @@ -510,13 +510,13 @@ if(NOT enable_memcheck) ADD_TEST(mc-bugged1-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh) ADD_TEST(mc-bugged2-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh) ADD_TEST(mc-centralized-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) ADD_TEST(mc-bugged1-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh) ADD_TEST(mc-bugged2-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh) ADD_TEST(mc-centralized-raw ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh) - endif(HAVE_RAWCTX) - endif(HAVE_MC) + endif() + endif() ### ### Declare that we know that some tests are broken @@ -529,20 +529,20 @@ if(NOT enable_memcheck) set_tests_properties(amok-saturate-sg-32-thread PROPERTIES WILL_FAIL true) if(CONTEXT_UCONTEXT) set_tests_properties(amok-bandwidth-sg-32-ucontext amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) set_tests_properties(amok-bandwidth-sg-32-raw amok-saturate-sg-32-raw PROPERTIES WILL_FAIL true) - endif(HAVE_RAWCTX) - else(${ARCH_32_BITS}) + endif() + else() set_tests_properties(amok-bandwidth-sg-64-thread PROPERTIES WILL_FAIL true) set_tests_properties(amok-saturate-sg-64-thread PROPERTIES WILL_FAIL true) if(CONTEXT_UCONTEXT) set_tests_properties(amok-bandwidth-sg-64-ucontext amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) set_tests_properties(amok-bandwidth-sg-64-raw amok-saturate-sg-64-raw PROPERTIES WILL_FAIL true) - endif(HAVE_RAWCTX) - endif(${ARCH_32_BITS}) + endif() + endif() # Those tests are broken : set to "fail" for release v3.6 if(release) @@ -552,15 +552,15 @@ if(NOT enable_memcheck) set_tests_properties(mc-centralized-thread PROPERTIES WILL_FAIL true) if(CONTEXT_UCONTEXT) set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true) - endif(CONTEXT_UCONTEXT) + endif() if(HAVE_RAWCTX) set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true) - endif(HAVE_RAWCTX) - endif(HAVE_MC) + endif() + endif() - endif(release) + endif() -endif(NOT enable_memcheck) +endif() ADD_TEST(tesh-simdag-full-links01 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK) ADD_TEST(tesh-simdag-full-links02 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK) @@ -582,8 +582,8 @@ add_test(testall ${CMAKE_BINARY_DIR}/src/testall) if(enable_auto_install) add_test(simgrid_install make install) -endif(enable_auto_install) +endif() if(enable_memcheck) include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake) -endif(enable_memcheck) +endif() diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake index dd4935ca26..8272ecd9ca 100644 --- a/buildtools/Cmake/CTestConfig.cmake +++ b/buildtools/Cmake/CTestConfig.cmake @@ -3,36 +3,36 @@ if(APPLE) SET(BUILDNAME "APPLE" CACHE TYPE INTERNAL FORCE) -else(APPLE) +else() SET(BUILDNAME "UNIX" CACHE TYPE INTERNAL FORCE) if(WIN32) SET(BUILDNAME "WINDOWS" CACHE TYPE INTERNAL FORCE) - endif(WIN32) -endif(APPLE) + endif() +endif() if(enable_memcheck) set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST -endif(enable_memcheck) +endif() if(enable_compile_warnings AND enable_compile_optimizations) SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE) -endif(enable_compile_warnings AND enable_compile_optimizations) +endif() if(enable_supernovae) SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE) -endif(enable_supernovae) +endif() if(HAVE_GTNETS) SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE) -endif(HAVE_GTNETS) +endif() if(HAVE_MC) SET(BUILDNAME "MODEL-CHECKING" CACHE TYPE INTERNAL FORCE) -endif(HAVE_MC) +endif() if(enable_memcheck) SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE) -endif(enable_memcheck) +endif() set(osname ${CMAKE_SYSTEM_NAME}) set(cpu ${CMAKE_SYSTEM_PROCESSOR}) @@ -47,4 +47,4 @@ SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000") set(PIPOL_IMAGE $ENV{PIPOL_IMAGE}) if(NOT ${PIPOL_IMAGE} MATCHES "\n") set(SITE ${PIPOL_IMAGE}) -endif(NOT ${PIPOL_IMAGE} MATCHES "\n") +endif() diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index f020bf1ea0..154219da89 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -12,12 +12,12 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") set(PROCESSOR_i686 1) set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}") message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}") - ELSE(${ARCH_32_BITS}) + ELSE() message(STATUS "System processor: amd64") set(SIMGRID_SYSTEM_PROCESSOR "amd64") set(PROCESSOR_x86_64 1) set(PROCESSOR_i686 0) - ENDIF(${ARCH_32_BITS}) + ENDIF() set(HAVE_RAWCTX 1) ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") @@ -52,10 +52,10 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390") ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh") message(STATUS "System processor: sh") -ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT fIND +ELSE() #PROCESSOR NOT fIND message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}") -ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") +ENDIF() message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}") @@ -70,25 +70,25 @@ TEST_BIG_ENDIAN(BIGENDIAN) include(FindGraphviz) if(WIN32) include(FindPcreWin) -else(WIN32) +else() include(FindPCRE) -endif(WIN32) +endif() set(HAVE_GTNETS 0) if(enable_gtnets) include(FindGTnets) -endif(enable_gtnets) +endif() if(enable_smpi) include(FindF2c) SET(HAVE_SMPI 1) -endif(enable_smpi) +endif() if(enable_lua) include(FindLua51Simgrid) -endif(enable_lua) +endif() set(HAVE_NS3 0) if(enable_ns3) include(FindNS3) -endif(enable_ns3) +endif() # Checks for header libraries functions. CHECK_LIBRARY_EXISTS(pthread pthread_create "" pthread) @@ -152,22 +152,22 @@ execute_process( if(HAVE_thread_storage_run) set(HAVE_THREAD_LOCAL_STORAGE 0) -else(HAVE_thread_storage_run) +else() set(HAVE_THREAD_LOCAL_STORAGE 1) -endif(HAVE_thread_storage_run) +endif() # Our usage of mmap is Linux-specific (flag MAP_ANONYMOUS), but kFreeBSD uses a GNU libc IF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU") SET(HAVE_MMAP 0) message(STATUS "Warning: MMAP is thought as non functional on this architecture (${CMAKE_SYSTEM})") -ENDIF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU") +ENDIF() if(WIN32) #THOSE FILES ARE FUNCTIONS ARE NOT DETECTED BUT THEY SHOULD... set(HAVE_UCONTEXT_H 1) set(HAVE_MAKECONTEXT 1) set(HAVE_SNPRINTF 1) set(HAVE_VSNPRINTF 1) -endif(WIN32) +endif() set(CONTEXT_UCONTEXT 0) SET(CONTEXT_THREADS 0) @@ -175,40 +175,40 @@ SET(HAVE_TRACING 1) if(enable_tracing) SET(HAVE_TRACING 1) -else(enable_tracing) +else() SET(HAVE_TRACING 0) -endif(enable_tracing) +endif() if(enable_jedule) SET(HAVE_JEDULE 1) -endif(enable_jedule) +endif() if(enable_latency_bound_tracking) SET(HAVE_LATENCY_BOUND_TRACKING 1) -else(enable_latency_bound_tracking) +else() if(enable_gtnets) 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) + else() SET(HAVE_LATENCY_BOUND_TRACKING 0) - endif(enable_gtnets) -endif(enable_latency_bound_tracking) + endif() +endif() if(enable_mallocators) SET(MALLOCATOR_IS_WANTED 1) -else(enable_mallocators) +else() SET(MALLOCATOR_IS_WANTED 0) -endif(enable_mallocators) +endif() if(enable_model-checking AND HAVE_MMAP) SET(HAVE_MC 1) SET(MMALLOC_WANT_OVERRIDE_LEGACY 1) include(FindLibunwind) -else(enable_model-checking AND HAVE_MMAP) +else() SET(HAVE_MC 0) SET(MMALLOC_WANT_OVERRIDE_LEGACY 0) -endif(enable_model-checking AND HAVE_MMAP) +endif() #-------------------------------------------------------------------------------------------------- ### Check for some architecture dependent values @@ -222,7 +222,7 @@ if(pthread) set(pthread 1) elseif(pthread) set(pthread 0) -endif(pthread) +endif() if(pthread) ### Test that we have a way to create semaphores @@ -239,10 +239,10 @@ if(pthread) set(HAVE_SEM_OPEN 0) message(STATUS "Warning: sem_open not compilable") message(STATUS "HAVE_SEM_OPEN_comp_output: ${HAVE_SEM_OPEN_comp_output}") - else(HAVE_SEM_OPEN_compil) + else() set(HAVE_SEM_OPEN 1) message(STATUS "sem_open is compilable") - endif(HAVE_SEM_OPEN_compil) + endif() exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_OPEN_run OUTPUT_VARIABLE var_compil) file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") @@ -250,14 +250,14 @@ if(pthread) if(NOT HAVE_SEM_OPEN_run) set(HAVE_SEM_OPEN 1) message(STATUS "sem_open is executable") - else(NOT HAVE_SEM_OPEN_run) + else() set(HAVE_SEM_OPEN 0) message(STATUS "Warning: sem_open not executable") - endif(NOT HAVE_SEM_OPEN_run) + endif() - else(HAVE_SEM_OPEN_LIB) + else() set(HAVE_SEM_OPEN 0) - endif(HAVE_SEM_OPEN_LIB) + endif() if(HAVE_SEM_INIT_LIB) exec_program( @@ -270,10 +270,10 @@ if(pthread) set(HAVE_SEM_INIT 0) message(STATUS "Warning: sem_init not compilable") message(STATUS "HAVE_SEM_INIT_comp_output: ${HAVE_SEM_OPEN_comp_output}") - else(HAVE_SEM_INIT_compil) + else() set(HAVE_SEM_INIT 1) message(STATUS "sem_init is compilable") - endif(HAVE_SEM_INIT_compil) + endif() exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_INIT_run OUTPUT_VARIABLE var_compil) file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") @@ -281,15 +281,15 @@ if(pthread) if(NOT HAVE_SEM_INIT_run) set(HAVE_SEM_INIT 1) message(STATUS "sem_init is executable") - else(NOT HAVE_SEM_INIT_run) + else() set(HAVE_SEM_INIT 0) message(STATUS "Warning: sem_init not executable") - endif(NOT HAVE_SEM_INIT_run) - endif(HAVE_SEM_INIT_LIB) + endif() + endif() if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT) message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).") - endif(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT) + endif() ### Test that we have a way to timewait for semaphores @@ -304,11 +304,11 @@ if(pthread) if(HAVE_SEM_TIMEDWAIT_run) set(HAVE_SEM_TIMEDWAIT 0) message(STATUS "timedwait not compilable") - else(HAVE_SEM_TIMEDWAIT_run) + else() set(HAVE_SEM_TIMEDWAIT 1) message(STATUS "timedwait is compilable") - endif(HAVE_SEM_TIMEDWAIT_run) - endif(HAVE_SEM_TIMEDWAIT_LIB) + endif() + endif() ### HAVE_MUTEX_TIMEDLOCK @@ -323,33 +323,33 @@ if(pthread) if(HAVE_MUTEX_TIMEDLOCK_run) set(HAVE_MUTEX_TIMEDLOCK 0) message(STATUS "timedlock not compilable") - else(HAVE_MUTEX_TIMEDLOCK_run) + else() message(STATUS "timedlock is compilable") set(HAVE_MUTEX_TIMEDLOCK 1) - endif(HAVE_MUTEX_TIMEDLOCK_run) - endif(HAVE_MUTEX_TIMEDLOCK_LIB) -endif(pthread) + endif() + endif() +endif() # AC_CHECK_MCSC(mcsc=yes, mcsc=no) set(mcsc_flags "") if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(mcsc_flags "-D_XOPEN_SOURCE") -endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") +endif() if(WIN32) if(ARCH_32_BITS) set(mcsc_flags "-D_XBT_WIN32 -D_I_X86_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt") - else(ARCH_32_BITS) + else() set(mcsc_flags "-D_XBT_WIN32 -D_AMD64_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt") - endif(ARCH_32_BITS) -endif(WIN32) + endif() +endif() IF(CMAKE_CROSSCOMPILING) IF(WIN32) set(windows_context "yes") set(IS_WINDOWS 1) - ENDIF(WIN32) -ELSE(CMAKE_CROSSCOMPILING) + ENDIF() +ELSE() file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") file(REMOVE ${CMAKE_BINARY_DIR}/conftestval) exec_program( @@ -360,9 +360,9 @@ ELSE(CMAKE_CROSSCOMPILING) if(NOT COMPILE_mcsc_VAR) message(STATUS "prog_AC_CHECK_MCSC.c is compilable") exec_program("${CMAKE_BINARY_DIR}/testprog" OUTPUT_VARIABLE var_compil) - else(NOT COMPILE_mcsc_VAR) + else() message(STATUS "prog_AC_CHECK_MCSC.c is not compilable") - endif(NOT COMPILE_mcsc_VAR) + endif() file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") if(EXISTS "${CMAKE_BINARY_DIR}/conftestval") @@ -371,15 +371,15 @@ ELSE(CMAKE_CROSSCOMPILING) if(mcsc) set(mcsc "yes") set(HAVE_UCONTEXT_H 1) - else(mcsc) + else() set(mcsc "no") - endif(mcsc) - else(EXISTS "${CMAKE_BINARY_DIR}/conftestval") + endif() + else() set(mcsc "no") - endif(EXISTS "${CMAKE_BINARY_DIR}/conftestval") + endif() message(STATUS "mcsc: ${mcsc}") -ENDIF(CMAKE_CROSSCOMPILING) +ENDIF() if(mcsc MATCHES "no" AND pthread) if(HAVE_WINDOWS_H) @@ -387,30 +387,30 @@ if(mcsc MATCHES "no" AND pthread) set(IS_WINDOWS 1) elseif(HAVE_WINDOWS_H) message(FATAL_ERROR "no appropriate backend found") - endif(HAVE_WINDOWS_H) -endif(mcsc MATCHES "no" AND pthread) + endif() +endif() #Only windows if(WIN32) if(NOT HAVE_WINDOWS_H) message(FATAL_ERROR "no appropriate backend found windows") - endif(NOT HAVE_WINDOWS_H) -endif(WIN32) + endif() +endif() if(windows_context MATCHES "yes") message(STATUS "Context change to windows") -endif(windows_context MATCHES "yes") +endif() #If can have both context if(mcsc) set(CONTEXT_UCONTEXT 1) -endif(mcsc) +endif() if(pthread) set(CONTEXT_THREADS 1) -endif(pthread) +endif() ############### ## GIT version check @@ -428,8 +428,8 @@ if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32) STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE}) STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE}) STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE}) - endif(url) -endif(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32) + endif() +endif() ################################### ## SimGrid and GRAS specific checks @@ -445,10 +445,10 @@ IF(NOT CMAKE_CROSSCOMPILING) if(BIGENDIAN) set(val_big "B${var1}") set(GRAS_BIGENDIAN 1) - else(BIGENDIAN) + else() set(val_big "l${var1}") set(GRAS_BIGENDIAN 0) - endif(BIGENDIAN) + endif() # The syntax of this magic string is given in src/xbt/datadesc/ddt_convert.c # It kinda matches the values that the xbt_arch_desc_t structure can take @@ -484,68 +484,68 @@ IF(NOT CMAKE_CROSSCOMPILING) #gras_arch=0; gras_size=32; gras_arch_name=little32_1; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 0) - endif(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:") + endif() if(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") #gras_arch=1; gras_size=32; gras_arch_name=little32_2; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 1) - endif(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") + endif() if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") #gras_arch=2; gras_size=32; gras_arch_name=little32_4; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 2) - endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") + endif() if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") #gras_arch=3; gras_size=32; gras_arch_name=little32_8; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 3) - endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") + endif() if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") #gras_arch=4; gras_size=64; gras_arch_name=little64; SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 4) - endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") + endif() if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:") #gras_arch=5; gras_size=64; gras_arch_name=little64_2; SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 5) - endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:") + endif() if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") #gras_arch=6; gras_size=32; gras_arch_name=big32_8; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 6) - endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") + endif() if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") #gras_arch=7; gras_size=32; gras_arch_name=big32_8_4; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 7) - endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") + endif() if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") #gras_arch=8; gras_size=32; gras_arch_name=big32_4; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 8) - endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") + endif() if(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") #gras_arch=9; gras_size=32; gras_arch_name=big32_2; SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 9) - endif(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") + endif() if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") #gras_arch=10; gras_size=64; gras_arch_name=big64; SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 10) - endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") + endif() if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") #gras_arch=11; gras_size=64; gras_arch_name=big64_8_4; SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 11) - endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") + endif() if(GRAS_THISARCH MATCHES "none") message(STATUS "architecture: ${val_big}") message(FATAL_ERROR "GRAS_THISARCH is empty: '${GRAS_THISARCH}'") - endif(GRAS_THISARCH MATCHES "none") + endif() # Check architecture signature end try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR @@ -566,7 +566,7 @@ IF(NOT CMAKE_CROSSCOMPILING) ) message(STATUS "SIZEOF_MAX ${var3}") SET(SIZEOF_MAX ${var3}) -ENDIF(NOT CMAKE_CROSSCOMPILING) +ENDIF() #-------------------------------------------------------------------------------------------------- @@ -575,16 +575,16 @@ if(HAVE_MAKECONTEXT OR WIN32) set(makecontext_CPPFLAGS "-DTEST_makecontext") if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(makecontext_CPPFLAGS_2 "-D_XOPEN_SOURCE") - endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") + endif() if(WIN32) if(ARCH_32_BITS) set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_") - else(ARCH_32_BITS) + else() set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_") - endif(ARCH_32_BITS) + endif() set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt") - endif(WIN32) + endif() file(REMOVE ${CMAKE_BINARY_DIR}/conftestval) @@ -605,10 +605,10 @@ if(HAVE_MAKECONTEXT OR WIN32) set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})") message(STATUS "${pth_skaddr_makecontext}") message(STATUS "${pth_sksize_makecontext}") - else(EXISTS ${CMAKE_BINARY_DIR}/conftestval) + else() # message(FATAL_ERROR "makecontext is not compilable") - endif(EXISTS ${CMAKE_BINARY_DIR}/conftestval) -endif(HAVE_MAKECONTEXT OR WIN32) + endif() +endif() #-------------------------------------------------------------------------------------------------- @@ -621,12 +621,12 @@ if (NOT CMAKE_CROSSCOMPILING) file(READ "${CMAKE_BINARY_DIR}/conftestval" stack) if(stack MATCHES "down") set(PTH_STACKGROWTH "-1") - endif(stack MATCHES "down") + endif() if(stack MATCHES "up") set(PTH_STACKGROWTH "1") - endif(stack MATCHES "up") + endif() -endif(NOT CMAKE_CROSSCOMPILING) +endif() ############### ## System checks ## @@ -645,9 +645,9 @@ try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR if(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN") SET(PRINTF_NULL_WORKING "0") -else(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN") +else() SET(PRINTF_NULL_WORKING "1") -endif(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN") +endif() #AC_CHECK_VA_COPY @@ -701,49 +701,49 @@ foreach(fct ${diff_va}) set(HAVE_VA_COPY 1) set(ac_cv_va_copy "C99") set(__VA_COPY_USE_C99 "va_copy((d),(s))") - endif(${fctbis} STREQUAL "va_copy((d),(s))") + endif() if(${fctbis} STREQUAL "VA_COPY((d),(s))") set(ac_cv_va_copy "GCM") set(__VA_COPY_USE_GCM "VA_COPY((d),(s))") - endif(${fctbis} STREQUAL "VA_COPY((d),(s))") + endif() if(${fctbis} STREQUAL "__va_copy((d),(s))") set(ac_cv_va_copy "GCH") set(__VA_COPY_USE_GCH "__va_copy((d),(s))") - endif(${fctbis} STREQUAL "__va_copy((d),(s))") + endif() if(${fctbis} STREQUAL "__builtin_va_copy((d),(s))") set(ac_cv_va_copy "GCB") set(__VA_COPY_USE_GCB "__builtin_va_copy((d),(s))") - endif(${fctbis} STREQUAL "__builtin_va_copy((d),(s))") + endif() if(${fctbis} STREQUAL "do { (d) = (s) } while (0)") set(ac_cv_va_copy "ASS") set(__VA_COPY_USE_ASS "do { (d) = (s); } while (0)") - endif(${fctbis} STREQUAL "do { (d) = (s) } while (0)") + endif() if(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)") set(ac_cv_va_copy "ASP") set(__VA_COPY_USE_ASP "do { *(d) = *(s); } while (0)") - endif(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)") + endif() if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))") set(ac_cv_va_copy "CPS") set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s), sizeof(s))") - endif(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))") + endif() if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))") set(ac_cv_va_copy "CPP") set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s), sizeof(*(s)))") - endif(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))") + endif() if(NOT STATUS_OK) set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}(d, s)") - endif(NOT STATUS_OK) + endif() set(STATUS_OK "1") - endif(COMPILE_VA_NULL_VAR) + endif() endforeach(fct ${diff_va}) @@ -757,78 +757,78 @@ try_compile(COMPILE_RESULT_VAR if(NOT COMPILE_RESULT_VAR) SET(need_getline "#define SIMGRID_NEED_GETLINE 1") SET(SIMGRID_NEED_GETLINE 1) -else(NOT COMPILE_RESULT_VAR) +else() SET(need_getline "") SET(SIMGRID_NEED_GETLINE 0) -endif(NOT COMPILE_RESULT_VAR) +endif() ### check for a working snprintf if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32) if(WIN32) #set(HAVE_SNPRINTF 1) #set(HAVE_VSNPRINTF 1) - endif(WIN32) + endif() if(CMAKE_CROSSCOMPILING) set(RUN_SNPRINTF_FUNC "cross") #set(PREFER_PORTABLE_SNPRINTF 1) - else(CMAKE_CROSSCOMPILING) + else() try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c ) - endif(CMAKE_CROSSCOMPILING) + endif() if(CMAKE_CROSSCOMPILING) set(RUN_VSNPRINTF_FUNC "cross") set(PREFER_PORTABLE_VSNPRINTF 1) - else(CMAKE_CROSSCOMPILING) + else() try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c ) - endif(CMAKE_CROSSCOMPILING) + endif() set(PREFER_PORTABLE_SNPRINTF 0) if(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") set(PREFER_PORTABLE_SNPRINTF 1) - endif(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") + endif() if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") set(PREFER_PORTABLE_SNPRINTF 1) - endif(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") -endif(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32) + endif() +endif() ### check for asprintf function familly if(HAVE_ASPRINTF) SET(simgrid_need_asprintf "") SET(NEED_ASPRINTF 0) -else(HAVE_ASPRINTF) +else() SET(simgrid_need_asprintf "#define SIMGRID_NEED_ASPRINTF 1") SET(NEED_ASPRINTF 1) -endif(HAVE_ASPRINTF) +endif() if(HAVE_VASPRINTF) SET(simgrid_need_vasprintf "") SET(NEED_VASPRINTF 0) -else(HAVE_VASPRINTF) +else() SET(simgrid_need_vasprintf "#define SIMGRID_NEED_VASPRINTF 1") SET(NEED_VASPRINTF 1) -endif(HAVE_VASPRINTF) +endif() ### check for addr2line find_path(ADDR2LINE NAMES addr2line PATHS NO_DEFAULT_PATHS ) if(ADDR2LINE) set(ADDR2LINE "${ADDR2LINE}/addr2line") -endif(ADDR2LINE) +endif() ### Check if OSX can compile with ucontext (with gcc 4.[1-5] it is broken) if(APPLE) if(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR) message(STATUS "Ucontext can't be used with this version of gcc (must be greater than 4.5)") set(HAVE_UCONTEXT_H 0) - endif(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR) -endif(APPLE) + endif() +endif() ### File to create @@ -860,7 +860,7 @@ if(NOT WIN32) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITOKI) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI) -endif(NOT WIN32) +endif() set(generated_headers_to_install ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h @@ -888,7 +888,7 @@ set(generated_files_to_clean ) if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") -else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") +else() configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/hostfile ${CMAKE_BINARY_DIR}/examples/smpi/hostfile COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY) @@ -909,14 +909,14 @@ else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_bcast.txt ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile ) -endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") +endif() SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${generated_files_to_clean}") IF(${ARCH_32_BITS}) set(WIN_ARCH "32") -ELSE(${ARCH_32_BITS}) +ELSE() set(WIN_ARCH "64") -ENDIF(${ARCH_32_BITS}) +ENDIF() configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 6e6ab3f42f..ead196181d 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -126,12 +126,12 @@ if(SMPI_F2C) ${SMPI_SRC} src/smpi/smpi_f77.c ) -else(SMPI_F2C) +else() set(EXTRA_DIST ${EXTRA_DIST} src/smpi/smpi_f77.c ) -endif(SMPI_F2C) +endif() set(GRAS_RL_SRC ${XBT_RL_SRC} @@ -203,7 +203,7 @@ if(HAVE_MMAP) ${XBT_SRC} src/xbt/mmalloc/mm.c ) -endif(HAVE_MMAP) +endif() set(GTNETS_SRC src/surf/gtnets/gtnets_interface.cc @@ -325,11 +325,11 @@ if(HAVE_GRAPHVIZ) set(SIMDAG_SRC ${SIMDAG_SRC} src/simdag/sd_dotloader.c ) -else(HAVE_GRAPHVIZ) +else() set(EXTRA_DIST ${EXTRA_DIST} src/simdag/sd_dotloader.c ) -endif(HAVE_GRAPHVIZ) +endif() set(GRAS_COMMON_SRC src/gras/Msg/gras_msg_exchange.c @@ -509,38 +509,38 @@ if(${CONTEXT_THREADS}) #pthread src/simix/smx_context_thread.c src/xbt/xbt_os_thread.c ) -else(${CONTEXT_THREADS}) # NOT pthread +else() # NOT pthread set(EXTRA_DIST ${EXTRA_DIST} src/simix/smx_context_thread.c src/xbt/xbt_os_thread.c ) -endif(${CONTEXT_THREADS}) +endif() if(${CONTEXT_UCONTEXT}) #ucontext set(SURF_SRC ${SURF_SRC} src/simix/smx_context_sysv.c ) -else(${CONTEXT_UCONTEXT}) # NOT ucontext +else() # NOT ucontext set(EXTRA_DIST ${EXTRA_DIST} src/simix/smx_context_sysv.c ) -endif(${CONTEXT_UCONTEXT}) +endif() # -->HAVE_GTNETS if(HAVE_GTNETS) set(GTNETS_USED ${GTNETS_SRC} ) -else(HAVE_GTNETS) +else() set(GTNETS_USED "") set(EXTRA_DIST ${EXTRA_DIST} ${GTNETS_SRC} ) -endif(HAVE_GTNETS) +endif() ### Simgrid Lib sources set(simgrid_sources @@ -563,14 +563,14 @@ if(HAVE_MC) ${simgrid_sources} ${MC_SRC} ) -endif(HAVE_MC) +endif() if(HAVE_NS3) set(simgrid_sources ${simgrid_sources} ${NS3_SRC} ) -endif(HAVE_NS3) +endif() # WINDOWS if(WIN32) @@ -580,7 +580,7 @@ if(WIN32) src/xbt/win32_ucontext.c src/xbt/xbt_os_thread.c ) -endif(WIN32) +endif() ### Gras Lib sources set(gras_sources @@ -595,12 +595,12 @@ if(${HAVE_LUA}) ${simgrid_sources} ${LUA_SRC} ) -else(${HAVE_LUA}) +else() set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC} ) -endif(${HAVE_LUA}) +endif() set(DOC_SOURCES doc/amok_bw_sat.png diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 70faceb4f9..afd614c2d6 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -27,7 +27,7 @@ install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/" if(NOT WIN32) if( NOT MANPAGE_DIR) set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages ) - endif( NOT MANPAGE_DIR) + endif() add_custom_target(manpages ALL COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR} @@ -37,7 +37,7 @@ if(NOT WIN32) install(FILES ${MANPAGE_DIR}/simgrid_update_xml.1 ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1 DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1) -endif(NOT WIN32) +endif() # binaries install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc @@ -80,7 +80,7 @@ install(TARGETS simgrid gras if(enable_smpi) install(TARGETS smpi DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -endif(enable_smpi) +endif() if(enable_lib_static AND NOT WIN32) install(TARGETS simgrid_static @@ -88,8 +88,8 @@ if(enable_lib_static AND NOT WIN32) if(enable_smpi) install(TARGETS smpi_static DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) - endif(enable_smpi) -endif(enable_lib_static AND NOT WIN32) + endif() +endif() # include files set(HEADERS @@ -126,7 +126,7 @@ if(HAVE_LUA) install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE} DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lua/5.1 ) -endif(HAVE_LUA) +endif() ########################################### ### Fill in the "make uninstall" target ### @@ -175,7 +175,7 @@ if(HAVE_LUA) COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE} WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/" ) -endif(HAVE_LUA) +endif() ################################################################ ## Build a sain "make dist" target to build a source package ### @@ -267,7 +267,7 @@ foreach(file ${source_to_pack}) TARGET dist-dir COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/ ) - endif(NOT OPERATION) + endif() # Actually copy the file add_custom_command( @@ -307,7 +307,7 @@ if(NOT enable_maintainer_mode) COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------" ) add_dependencies(dist echo-dist) -endif(NOT enable_maintainer_mode) +endif() ########################################### ### Fill in the "make distcheck" target ### @@ -359,11 +359,11 @@ if(enable_memcheck) add_custom_target(check COMMAND ctest -D ExperimentalMemCheck ) -else(enable_memcheck) +else() add_custom_target(check COMMAND make test ) -endif(enable_memcheck) +endif() ####################################### ### Fill in the "make xxx-clean" target ### diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index b864063813..4b627253a8 100644 --- a/buildtools/Cmake/Flags.cmake +++ b/buildtools/Cmake/Flags.cmake @@ -4,39 +4,39 @@ set(optCFLAGS "") if(NOT __VISUALC__ AND NOT __BORLANDC__) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3") -else(NOT __VISUALC__ AND NOT __BORLANDC__) +else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi") -endif(NOT __VISUALC__ AND NOT __BORLANDC__) +endif() if(enable_compile_warnings) set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wclobbered -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror -Wno-error=clobbered ") if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5") set(warnCFLAGS "${warnCFLAGS}-Wno-error=unused-but-set-variable ") - endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5") -endif(enable_compile_warnings) + endif() +endif() if(enable_compile_optimizations) set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5") set(optCFLAGS "${optCFLAGS}-flto ") - endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5") -else(enable_compile_optimizations) + endif() +else() set(optCFLAGS "-O0 ") -endif(enable_compile_optimizations) +endif() if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") set(optCFLAGS "-O0 ") -endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") +endif() if(NOT enable_debug) set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}") -endif(NOT enable_debug) +endif() if(enable_msg_deprecated) set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}") -endif(enable_msg_deprecated) +endif() set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}") @@ -45,7 +45,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}") # Try to make Mac a bit more complient to open source standards if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE") -endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") +endif() set(TESH_OPTION "") if(enable_coverage) @@ -57,19 +57,19 @@ if(enable_coverage) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") set(TESH_OPTION --enable-coverage) add_definitions(-fprofile-arcs -ftest-coverage) - endif(GCOV_PATH) -endif(enable_coverage) + endif() +endif() if(NOT $ENV{CFLAGS} STREQUAL "") message(STATUS "Add CFLAGS: \"$ENV{CFLAGS}\" to CMAKE_C_FLAGS") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}") -endif(NOT $ENV{CFLAGS} STREQUAL "") +endif() if(NOT $ENV{LDFLAGS} STREQUAL "") message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_C_LINK_FLAGS") set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}") -endif(NOT $ENV{LDFLAGS} STREQUAL "") +endif() if(enable_model-checking AND enable_compile_optimizations) message(WARNING "Sorry for now GCC optimizations does not work with model checking.\nPlease turn off optimizations with command:\ncmake -Denable_compile_optimizations=off. ") -endif(enable_model-checking AND enable_compile_optimizations) +endif() diff --git a/buildtools/Cmake/GenerateDevGuide.cmake b/buildtools/Cmake/GenerateDevGuide.cmake index e20f2890ad..8b09f5b0ae 100644 --- a/buildtools/Cmake/GenerateDevGuide.cmake +++ b/buildtools/Cmake/GenerateDevGuide.cmake @@ -45,7 +45,7 @@ if(DOXYGEN_PATH) WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/doxygen ) -else(DOXYGEN_PATH) +else() ADD_CUSTOM_TARGET(dev_guide COMMENT "Generating the SimGrid documentation..." @@ -58,6 +58,6 @@ else(DOXYGEN_PATH) COMMAND false ) -endif(DOXYGEN_PATH) +endif() ##############################################################################" diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index c69b51629e..ae81f04f02 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -69,13 +69,13 @@ if(DOXYGEN_PATH) if(DOXYGEN_MAJOR_VERSION STRLESS "2" AND DOXYGEN_MINOR_VERSION STRLESS "8") add_dependencies(simgrid_documentation error_doxygen) - else(DOXYGEN_MAJOR_VERSION STRLESS "2" AND DOXYGEN_MINOR_VERSION STRLESS "8") + else() add_dependencies(simgrid_documentation ref_guide) add_dependencies(simgrid_documentation user_guide) add_dependencies(simgrid_documentation dev_guide) - endif(DOXYGEN_MAJOR_VERSION STRLESS "2" AND DOXYGEN_MINOR_VERSION STRLESS "8") + endif() -endif(DOXYGEN_PATH) +endif() ############################################# ### Fill in the "make sync-gforge" target ### @@ -144,7 +144,7 @@ add_custom_target(sync-gforge-dtd # string(REPLACE " - \\ref subsection" " - \\ref " line2 ${line2}) # string(REPLACE " - \\ref subsubsection" " - \\ref " line2 ${line2}) # file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n") -# endif(line2 AND NOT line3) +# endif() # endforeach(line ${file_content}) # # file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "\n") # make sure it exists @@ -152,7 +152,7 @@ add_custom_target(sync-gforge-dtd # string(REGEX MATCH ".*ref.*" line_ok ${line}) # if(line_ok) # file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line_ok}\n") -# endif(line_ok) +# endif() # endforeach(line ${valeur_line}) # # exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) @@ -161,7 +161,7 @@ add_custom_target(sync-gforge-dtd # file(READ "${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" file_content) # message("${file_content}") # exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc") -# endif(compare_files) +# endif() #endforeach(file_name ${LISTE_GTUT}) # #file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) @@ -182,7 +182,7 @@ add_custom_target(sync-gforge-dtd # string(REGEX REPLACE " .*" "" line2 "${line2}") # set(line2 " - \\ref ${line2}") # file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n") -# endif(line2) +# endif() # endforeach(line ${file_content}) # # foreach(line ${valeur_line}) @@ -192,7 +192,7 @@ add_custom_target(sync-gforge-dtd # string(REGEX MATCH "Table of Contents" line4 "${line}") # if(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) # file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc " ${line}\n") -# endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) +# endif() # endforeach(line ${valeur_line}) #endforeach(file_name ${LISTE_GTUT}) # @@ -202,15 +202,15 @@ add_custom_target(sync-gforge-dtd # string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}") # if(line1) # file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line}\n") -# endif(line1) +# endif() #endforeach(line ${file_content}) # #exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) #if(compare_files) # message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc") # exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc") -#else(compare_files) +#else() # file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc) -#endif(compare_files) +#endif() # #file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) \ No newline at end of file diff --git a/buildtools/Cmake/GenerateDocWin.cmake b/buildtools/Cmake/GenerateDocWin.cmake index 61d1a47d47..7283e59b42 100644 --- a/buildtools/Cmake/GenerateDocWin.cmake +++ b/buildtools/Cmake/GenerateDocWin.cmake @@ -11,7 +11,7 @@ if(WGET_PATH) COMMAND ${WGET_PATH}/wget.exe -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/ WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html ) -endif(WGET_PATH) +endif() if(NSIS_PATH) ADD_CUSTOM_TARGET(nsis @@ -20,4 +20,4 @@ if(NSIS_PATH) COMMAND ${NSIS_PATH}/makensis.exe simgrid.nsi WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/ ) -endif(NSIS_PATH) \ No newline at end of file +endif() \ No newline at end of file diff --git a/buildtools/Cmake/GenerateRefGuide.cmake b/buildtools/Cmake/GenerateRefGuide.cmake index 1e7e6fe996..6e136fcc91 100644 --- a/buildtools/Cmake/GenerateRefGuide.cmake +++ b/buildtools/Cmake/GenerateRefGuide.cmake @@ -62,7 +62,7 @@ if(FIG2DEV_PATH) WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/doxygen ) -else(DOXYGEN_PATH AND FIG2DEV_PATH) +else() ADD_CUSTOM_TARGET(ref_guide COMMENT "Generating the SimGrid documentation..." @@ -76,7 +76,7 @@ else(DOXYGEN_PATH AND FIG2DEV_PATH) COMMAND false ) -endif(FIG2DEV_PATH) +endif() ##############################################################################" diff --git a/buildtools/Cmake/GenerateUserGuide.cmake b/buildtools/Cmake/GenerateUserGuide.cmake index 72a3861517..a4f052670d 100644 --- a/buildtools/Cmake/GenerateUserGuide.cmake +++ b/buildtools/Cmake/GenerateUserGuide.cmake @@ -66,7 +66,7 @@ if(FIG2DEV_PATH) WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen ) -else(FIG2DEV_PATH) +else() ADD_CUSTOM_TARGET(user_guide COMMENT "Generating the SimGrid user guide..." @@ -80,7 +80,7 @@ else(FIG2DEV_PATH) COMMAND false ) -endif(FIG2DEV_PATH) +endif() ADD_CUSTOM_TARGET(user_guide_pdf COMMAND ${CMAKE_COMMAND} -E echo "XX First pass simgrid_user_guide.pdf" diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake index 26d587d14d..be667ea142 100644 --- a/buildtools/Cmake/MaintainerMode.cmake +++ b/buildtools/Cmake/MaintainerMode.cmake @@ -35,7 +35,7 @@ if(enable_maintainer_mode AND NOT WIN32) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.tab.cacc;${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.tab.hacc;${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/automaton_parse.yy.c" ) - endif(BISON_EXE AND LEX_EXE) + endif() IF(FLEX_EXE) set(HAVE_FLEX 1) @@ -45,7 +45,7 @@ if(enable_maintainer_mode AND NOT WIN32) string(REGEX MATCH "[0-9]+[.]+[0-9]+$" FLEX_VERSION "${FLEX_VERSION}") string(REGEX MATCH "^[0-9]+" FLEX_MINOR_VERSION "${FLEX_VERSION}") string(REGEX MATCH "[0-9]+$" FLEX_PATCH_VERSION "${FLEX_VERSION}") - ENDIF(FLEX_EXE) + ENDIF() IF(FLEXML_EXE) set(HAVE_FLEXML 1) @@ -53,7 +53,7 @@ if(enable_maintainer_mode AND NOT WIN32) string(REGEX MATCH "[0-9]+[.]+[0-9]+" FLEXML_VERSION "${FLEXML_VERSION}") string(REGEX MATCH "^[0-9]*" FLEXML_MAJOR_VERSION "${FLEXML_VERSION}") string(REGEX MATCH "[0-9]*$" FLEXML_MINOR_VERSION "${FLEXML_VERSION}") - ENDIF(FLEXML_EXE) + ENDIF() message(STATUS "Found flex: ${FLEX_EXE}") message(STATUS "Found flexml: ${FLEXML_EXE}") @@ -177,18 +177,18 @@ if(enable_maintainer_mode AND NOT WIN32) ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c ) - else(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE) + else() if(NOT HAVE_FLEXML) message(STATUS "Error : Install flexml before use maintainer mode.") - endif(NOT HAVE_FLEXML) + endif() if(NOT HAVE_FLEX) message(STATUS "Error : Install flex before use maintainer mode.") - endif(NOT HAVE_FLEX) + endif() if(NOT SED_EXE) message(STATUS "Error : Install sed before use maintainer mode.") - endif(NOT SED_EXE) + endif() message(FATAL_ERROR STATUS "Error : Need to install all tools for maintainer mode !!!") - endif(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE) + endif() -endif(enable_maintainer_mode AND NOT WIN32) +endif() diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index d37b8bf4eb..11d16efd9a 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/buildtools/Cmake/MakeLib.cmake @@ -16,15 +16,15 @@ set_target_properties(gras PROPERTIES VERSION ${libgras_version}) if(enable_lib_static) add_library(simgrid_static STATIC ${simgrid_sources}) -endif(enable_lib_static) +endif() if(enable_smpi) add_library(smpi SHARED ${SMPI_SRC}) set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version}) if(enable_lib_static) add_library(smpi_static STATIC ${SMPI_SRC}) - endif(enable_lib_static) -endif(enable_smpi) + endif() +endif() add_dependencies(gras maintainer_files) add_dependencies(simgrid maintainer_files) @@ -34,16 +34,16 @@ if (enable_supernovae) add_dependencies(simgrid ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c) if(enable_lib_static) add_dependencies(simgrid_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c) - endif(enable_lib_static) + endif() add_dependencies(gras ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_gras.c) if(enable_smpi) add_dependencies(smpi ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) if(enable_lib_static) add_dependencies(smpi_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) - endif(enable_lib_static) - endif(enable_smpi) -endif(enable_supernovae) + endif() + endif() +endif() # Compute the dependencies of GRAS ################################## @@ -51,7 +51,7 @@ set(GRAS_DEP "-lm -pthread") if(HAVE_POSIX_GETTIME) SET(GRAS_DEP "${GRAS_DEP} -lrt") -endif(HAVE_POSIX_GETTIME) +endif() # the following is probably unneed since it kills the previous # GRAS_DEP (and is thus probably invalid). @@ -60,8 +60,8 @@ endif(HAVE_POSIX_GETTIME) if(with_context MATCHES windows) if(pthread) SET(GRAS_DEP "msg") - endif(pthread) -endif(with_context MATCHES windows) + endif() +endif() target_link_libraries(gras ${GRAS_DEP}) # Compute the dependencies of SimGrid @@ -71,8 +71,8 @@ set(SIMGRID_DEP "-lm -lpcre") if(pthread) if(${CONTEXT_THREADS}) SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread") - endif(${CONTEXT_THREADS}) -endif(pthread) + endif() +endif() if(HAVE_LUA) ADD_CUSTOM_TARGET(link_simgrid_lua ALL @@ -98,21 +98,21 @@ if(HAVE_LUA) COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test ) SET(SIMGRID_DEP "${SIMGRID_DEP} -l${LIB_LUA_NAME}") -endif(HAVE_LUA) +endif() if(HAVE_GRAPHVIZ) if(HAVE_CGRAPH_LIB) SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph") - else(HAVE_CGRAPH_LIB) + else() if(HAVE_AGRAPH_LIB) SET(SIMGRID_DEP "${SIMGRID_DEP} -lagraph -lcdt") - endif(HAVE_AGRAPH_LIB) - endif(HAVE_CGRAPH_LIB) -endif(HAVE_GRAPHVIZ) + endif() + endif() +endif() if(HAVE_GTNETS) SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets") -endif(HAVE_GTNETS) +endif() if(HAVE_MC) # The availability of libunwind was checked in CompleteInFiles.cmake @@ -122,24 +122,24 @@ if(HAVE_MC) # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME) if(PROCESSOR_x86_64) SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64") - else(PROCESSOR_x86_64) + else() SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86") - endif(PROCESSOR_x86_64) -endif(HAVE_MC) + endif() +endif() if(HAVE_NS3) if(${NS3_VERSION} EQUAL 310) SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_NS3_3_10") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_NS3_3_10") - else(${NS3_VERSION} EQUAL 310) + else() SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3-core -lns3-csma -lns3-point-to-point -lns3-internet -lns3-applications") - endif(${NS3_VERSION} EQUAL 310) -endif(HAVE_NS3) + endif() +endif() if(HAVE_POSIX_GETTIME) SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt") -endif(HAVE_POSIX_GETTIME) +endif() target_link_libraries(simgrid ${SIMGRID_DEP}) @@ -148,10 +148,10 @@ target_link_libraries(simgrid ${SIMGRID_DEP}) set(SMPI_LDEP "") if(APPLE) set(SMPI_LDEP "-Wl,-U -Wl,_smpi_simulated_main") -endif(APPLE) +endif() if(enable_smpi) target_link_libraries(smpi simgrid ${SMPI_LDEP}) -endif(enable_smpi) +endif() # Pass dependencies to static libs ################################## @@ -162,11 +162,11 @@ if(enable_lib_static) if(enable_smpi) target_link_libraries(smpi_static simgrid ${SMPI_LDEP}) set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi) - endif(enable_smpi) -endif(enable_lib_static) + endif() +endif() # Dependencies from maintainer mode ################################### if(enable_maintainer_mode AND BISON_EXE AND LEX_EXE) add_dependencies(simgrid automaton_generated_src) -endif(enable_maintainer_mode AND BISON_EXE AND LEX_EXE) +endif() diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake index 866fe1d9b0..cd3e5da027 100644 --- a/buildtools/Cmake/MakeLibWin.cmake +++ b/buildtools/Cmake/MakeLibWin.cmake @@ -14,24 +14,24 @@ if(ARCH_32_BITS) $ENV{PATH} PATH_SUFFIXES bin/ c/bin ) -else(ARCH_32_BITS) +else() find_library(PATH_PTHREAD_LIB NAMES pthreadGC2-w64.dll HINTS $ENV{PATH} PATH_SUFFIXES bin/ c/bin ) -endif(ARCH_32_BITS) +endif() set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}") set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}") if(ARCH_32_BITS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486") -else(ARCH_32_BITS) +else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") # message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.") -endif(ARCH_32_BITS) +endif() target_link_libraries(gras ${GRAS_DEP}) target_link_libraries(simgrid ${SIMGRID_DEP}) @@ -41,7 +41,7 @@ message(STATUS "pexports: ${PEXPORTS_PATH}") if(PEXPORTS_PATH) add_custom_command(TARGET simgrid POST_BUILD COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def) -endif(PEXPORTS_PATH) +endif() if(enable_smpi) add_library(smpi SHARED ${SMPI_SRC}) @@ -49,4 +49,4 @@ if(enable_smpi) set(SMPI_LDEP "") target_link_libraries(smpi simgrid ${SMPI_LDEP}) -endif(enable_smpi) \ No newline at end of file +endif() \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindF2c.cmake b/buildtools/Cmake/Modules/FindF2c.cmake index e73fcc4c71..69e519f9a7 100644 --- a/buildtools/Cmake/Modules/FindF2c.cmake +++ b/buildtools/Cmake/Modules/FindF2c.cmake @@ -36,28 +36,28 @@ find_library(HAVE_F2C_LIB if(HAVE_F2C_H) set(HAVE_SMPI_F2C_H 1) -endif(HAVE_F2C_H) +endif() message(STATUS "Looking for f2c.h") if(HAVE_F2C_H) message(STATUS "Looking for f2c.h - found") -else(HAVE_F2C_H) +else() message(STATUS "Looking for f2c.h - not found") -endif(HAVE_F2C_H) +endif() message(STATUS "Looking for lib f2c") if(HAVE_F2C_LIB) message(STATUS "Looking for lib f2c - found") -else(HAVE_F2C_LIB) +else() message(STATUS "Looking for lib f2c - not found") -endif(HAVE_F2C_LIB) +endif() message(STATUS "Looking for bin f2c") if(F2C_EXE) message(STATUS "Found F2C: ${F2C_EXE}") -else(F2C_EXE) +else() message(STATUS "Looking for bin f2c - not found") -endif(F2C_EXE) +endif() mark_as_advanced(HAVE_F2C_H) mark_as_advanced(F2C_EXE) @@ -65,15 +65,15 @@ mark_as_advanced(HAVE_F2C_LIB) if(HAVE_F2C_H) include_directories(${HAVE_F2C_H}) -else(HAVE_F2C_H) +else() if(WIN32) message("-- Fortran for smpi is not installed (http://www.netlib.org/f2c/).") - else(WIN32) + else() message(FATAL_ERROR "You should install f2c before use smpi.") - endif(WIN32) -endif(HAVE_F2C_H) + endif() +endif() set(SMPI_F2C 0) if(HAVE_F2C_H AND F2C_EXE AND HAVE_F2C_LIB) set(SMPI_F2C 1) -endif(HAVE_F2C_H AND F2C_EXE AND HAVE_F2C_LIB) +endif() diff --git a/buildtools/Cmake/Modules/FindGTnets.cmake b/buildtools/Cmake/Modules/FindGTnets.cmake index 46e24c2ec4..bd12fa6439 100644 --- a/buildtools/Cmake/Modules/FindGTnets.cmake +++ b/buildtools/Cmake/Modules/FindGTnets.cmake @@ -20,38 +20,38 @@ if(HAVE_GTNETS_LIB AND HAVE_SIMULATOR_H) OUTPUT_VARIABLE COMPILE_GTNETS_VAR) if(COMPILE_GTNETS_VAR) SET(HAVE_GTNETS 0) - else(COMPILE_GTNETS_VAR) + else() SET(HAVE_GTNETS 1) string(REGEX MATCH "-L${GTNETS_LIB_PATH} " operation "${CMAKE_C_FLAGS}") if(NOT operation) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${GTNETS_LIB_PATH} ") - endif(NOT operation) + endif() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_SIMULATOR_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) + endif() - endif(COMPILE_GTNETS_VAR) + endif() -else(HAVE_GTNETS_LIB AND HAVE_SIMULATOR_H) +else() if(NOT HAVE_GTNETS_LIB) message(STATUS "Gtnets is enabled but can't find it.") - endif(NOT HAVE_GTNETS_LIB) + endif() if(NOT HAVE_SIMULATOR_H) message(STATUS "Gtnets needs simulator.h") - endif(NOT HAVE_SIMULATOR_H) -endif(HAVE_GTNETS_LIB AND HAVE_SIMULATOR_H) + endif() +endif() message(STATUS "Looking for lib gtnets patch") if(HAVE_GTNETS) message(STATUS "Looking for lib gtnets patch - found") -else(HAVE_GTNETS) +else() message(STATUS "Looking for lib gtnets patch - not found") -endif(HAVE_GTNETS) +endif() mark_as_advanced(HAVE_GTNETS_LIB) mark_as_advanced(HAVE_SIMULATOR_H) \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindGraphviz.cmake b/buildtools/Cmake/Modules/FindGraphviz.cmake index cf16bff2c3..c2c6c957ba 100644 --- a/buildtools/Cmake/Modules/FindGraphviz.cmake +++ b/buildtools/Cmake/Modules/FindGraphviz.cmake @@ -100,11 +100,11 @@ if(HAVE_CDT_LIB) if(HAVE_AGRAPH_LIB) string(REGEX REPLACE "/libagraph.*" "" lib_graphviz ${HAVE_AGRAPH_LIB}) - else(HAVE_AGRAPH_LIB) + else() if(HAVE_CGRAPH_LIB) string(REGEX REPLACE "/libcgraph.*" "" lib_graphviz ${HAVE_CGRAPH_LIB}) - endif(HAVE_CGRAPH_LIB) - endif(HAVE_AGRAPH_LIB) + endif() + endif() if(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H) @@ -112,81 +112,81 @@ if(HAVE_CDT_LIB) string(REPLACE "/graphviz/graph.h" "" file_graphviz_h ${HAVE_GRAPH_H}) string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h}) set(GRAPH_H 1) - endif(HAVE_GRAPH_H) + endif() if(HAVE_AGRAPH_H) string(REPLACE "/graphviz/agraph.h" "" file_graphviz_h ${HAVE_AGRAPH_H}) string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h}) set(AGRAPH_H 1) - endif(HAVE_AGRAPH_H) + endif() if(HAVE_CGRAPH_H) string(REPLACE "/graphviz/cgraph.h" "" file_graphviz_h ${HAVE_CGRAPH_H}) string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h}) set(CGRAPH_H 1) - endif(HAVE_CGRAPH_H) + endif() include_directories(${file_graphviz_h} ${file_graphviz_h}/graphviz) link_directories(${lib_graphviz}) set(HAVE_GRAPHVIZ "1") - else(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H) + else() set(HAVE_GRAPHVIZ "0") - endif(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H) + endif() - else(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB) + else() set(HAVE_GRAPHVIZ "0") - endif(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB) + endif() -endif(HAVE_CDT_LIB) +endif() mark_as_advanced(HAVE_GRAPHVIZ) message(STATUS "Looking for agraph.h") if(HAVE_AGRAPH_H) message(STATUS "Looking for agraph.h - found") -else(HAVE_AGRAPH_H) +else() message(STATUS "Looking for agraph.h - not found") -endif(HAVE_AGRAPH_H) +endif() message(STATUS "Looking for cgraph.h") if(HAVE_CGRAPH_H) message(STATUS "Looking for cgraph.h - found") -else(HAVE_CGRAPH_H) +else() message(STATUS "Looking for cgraph.h - not found") -endif(HAVE_CGRAPH_H) +endif() message(STATUS "Looking for graph.h") if(HAVE_GRAPH_H) message(STATUS "Looking for graph.h - found") -else(HAVE_GRAPH_H) +else() message(STATUS "Looking for graph.h - not found") -endif(HAVE_GRAPH_H) +endif() message(STATUS "Looking for lib agraph") if(HAVE_AGRAPH_LIB) message(STATUS "Looking for lib agraph - found") -else(HAVE_AGRAPH_LIB) +else() message(STATUS "Looking for lib agraph - not found") -endif(HAVE_AGRAPH_LIB) +endif() message(STATUS "Looking for lib cgraph") if(HAVE_CGRAPH_LIB) message(STATUS "Looking for lib cgraph - found") -else(HAVE_CGRAPH_LIB) +else() message(STATUS "Looking for lib cgraph - not found") -endif(HAVE_CGRAPH_LIB) +endif() message(STATUS "Looking for lib graph") if(HAVE_GRAPH_LIB) message(STATUS "Looking for lib graph - found") -else(HAVE_GRAPH_LIB) +else() message(STATUS "Looking for lib graph - not found") -endif(HAVE_GRAPH_LIB) +endif() message(STATUS "Looking for lib cdt") if(HAVE_CDT_LIB) message(STATUS "Looking for lib cdt - found") -else(HAVE_CDT_LIB) +else() message(STATUS "Looking for lib cdt - not found") -endif(HAVE_CDT_LIB) \ No newline at end of file +endif() \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindLibunwind.cmake b/buildtools/Cmake/Modules/FindLibunwind.cmake index 101a9df300..56de1f79a0 100644 --- a/buildtools/Cmake/Modules/FindLibunwind.cmake +++ b/buildtools/Cmake/Modules/FindLibunwind.cmake @@ -12,7 +12,7 @@ if(PROCESSOR_x86_64) /opt/csw /sw /usr) -else(PROCESSOR_x86_64) +else() find_library(PATH_LIBUNWIND_LIB NAMES unwind HINTS @@ -26,7 +26,7 @@ else(PROCESSOR_x86_64) /opt/csw /sw /usr) -endif(PROCESSOR_x86_64) +endif() find_path(PATH_LIBUNWIND_H "libunwind.h" HINTS @@ -44,16 +44,16 @@ find_path(PATH_LIBUNWIND_H "libunwind.h" message(STATUS "Looking for libunwind.h") if(PATH_LIBUNWIND_H) message(STATUS "Looking for libunwind.h - found") -else(PATH_LIBUNWIND_H) +else() message(STATUS "Looking for libunwind.h - not found") -endif(PATH_LIBUNWIND_H) +endif() message(STATUS "Looking for libunwind") if(PATH_LIBUNWIND_LIB) message(STATUS "Looking for libunwind - found") -else(PATH_LIBUNWIND_LIB) +else() message(STATUS "Looking for libunwind - not found") -endif(PATH_LIBUNWIND_LIB) +endif() if(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H) string(REGEX REPLACE "/libunwind.*[.]${LIB_EXE}$" "" PATH_LIBUNWIND_LIB "${PATH_LIBUNWIND_LIB}") @@ -62,9 +62,9 @@ if(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H) include_directories(${PATH_LIBUNWIND_H}) link_directories(${PATH_LIBUNWIND_LIB}) -else(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H) +else() message(FATAL_ERROR "Please either install the libunwind7-dev package (or equivalent) or turn off the model-checking option of SimGrid.") -endif(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H) +endif() mark_as_advanced(PATH_LIBUNWIND_H) mark_as_advanced(PATH_LIBUNWIND_LIB) \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake index 5d54f0dcda..2b3c4d1716 100644 --- a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake +++ b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake @@ -5,13 +5,13 @@ mark_as_advanced(HAVE_LUA_BIN) message(STATUS "Looking for lua.h") if(LUA_INCLUDE_DIR) message(STATUS "Looking for lua.h - found") -else(LUA_INCLUDE_DIR) +else() message(STATUS "Looking for lua.h - not found") -endif(LUA_INCLUDE_DIR) +endif() if(HAVE_LUA_BIN) message(STATUS "Found Lua: ${HAVE_LUA_BIN}") -endif(HAVE_LUA_BIN) +endif() set(LIB_LUA_NAME "") @@ -22,8 +22,8 @@ foreach(lib_path ${LUA_LIBRARIES}) string(REPLACE "lib" "" LIB_LUA_NAME "${LIB_LUA_NAME}") if(LIB_LUA_NAME) string(REPLACE "/lib${LIB_LUA_NAME}.${LIB_EXE}" "" LUA_LIBRARY_DIR ${lib_path}) - endif(LIB_LUA_NAME) - endif(NOT LIB_LUA_NAME) + endif() + endif() endforeach(lib_path ${LUA_LIBRARIES}) message(STATUS "Looking for lib lua") @@ -31,14 +31,14 @@ if(LUA_LIBRARY_DIR) message(STATUS "Looking for lib lua - found") message(STATUS "Lua version: ${LIB_LUA_NAME}") message(STATUS "Lib path : ${LUA_LIBRARY_DIR}") -else(LUA_LIBRARY_DIR) +else() message(STATUS "Looking for lib lua - not found") -endif(LUA_LIBRARY_DIR) +endif() if(LUA51_FOUND) set(HAVE_LUA 1) include_directories(${LUA_INCLUDE_DIR}) link_directories(${LUA_LIBRARY_DIR}) -else(LUA51_FOUND) +else() message(STATUS "Warning : Lua need version 5.1") -endif(LUA51_FOUND) +endif() diff --git a/buildtools/Cmake/Modules/FindNS3.cmake b/buildtools/Cmake/Modules/FindNS3.cmake index d9a2687859..04e568c836 100644 --- a/buildtools/Cmake/Modules/FindNS3.cmake +++ b/buildtools/Cmake/Modules/FindNS3.cmake @@ -29,25 +29,25 @@ find_path(HAVE_CORE_MODULE_H message(STATUS "Looking for core-module.h") if(HAVE_CORE_MODULE_H) message(STATUS "Looking for core-module.h - found") -else(HAVE_CORE_MODULE_H) +else() message(STATUS "Looking for core-module.h - not found") -endif(HAVE_CORE_MODULE_H) +endif() mark_as_advanced(HAVE_CORE_MODULE_H) message(STATUS "Looking for lib ns3") if(HAVE_NS3_LIB) message(STATUS "Looking for lib ns3 - found") -else(HAVE_NS3_LIB) +else() message(STATUS "Looking for lib ns3 - not found") -endif(HAVE_NS3_LIB) +endif() mark_as_advanced(HAVE_NS3_LIB) message(STATUS "Looking for lib ns3-core") if(HAVE_NS3_CORE_LIB) message(STATUS "Looking for lib ns3-core - found") -else(HAVE_NS3_CORE_LIB) +else() message(STATUS "Looking for lib ns3-core - not found") -endif(HAVE_NS3_CORE_LIB) +endif() mark_as_advanced(HAVE_NS3_LIB) mark_as_advanced(HAVE_NS3_CORE_LIB) @@ -58,37 +58,37 @@ if(HAVE_CORE_MODULE_H) set(HAVE_NS3 1) set(NS3_VERSION 310) string(REPLACE "/libns3.${LIB_EXE}" "" HAVE_NS3_LIB "${HAVE_NS3_LIB}") - endif(HAVE_NS3_LIB) + endif() if(HAVE_NS3_CORE_LIB) message(STATUS "NS-3 version > 3.10") set(HAVE_NS3 1) set(NS3_VERSION 312) string(REPLACE "/libns3-core.${LIB_EXE}" "" HAVE_NS3_LIB "${HAVE_NS3_CORE_LIB}") - endif(HAVE_NS3_CORE_LIB) -endif(HAVE_CORE_MODULE_H) + endif() +endif() if(HAVE_NS3) string(REGEX MATCH "${HAVE_NS3_LIB}" operation "$ENV{LD_LIBRARY_PATH}") if(NOT operation) message(STATUS "Warning: To use NS-3 don't forget to set LD_LIBRARY_PATH with: export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HAVE_NS3_LIB}") - else(NOT operation) + else() string(REGEX MATCH "-L${HAVE_NS3_LIB} " operation1 "${CMAKE_C_FLAGS}") if(NOT operation1) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${HAVE_NS3_LIB} ") - endif(NOT operation1) + endif() string(REGEX MATCH "-I${HAVE_CORE_MODULE_H} " operation1 "${CMAKE_C_FLAGS}") if(NOT operation1) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_CORE_MODULE_H} ") - endif(NOT operation1) + endif() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_CORE_MODULE_H} -L${HAVE_NS3_LIB} ") - endif(NOT operation) -else(HAVE_NS3) + endif() +else() message(STATUS "Warning: To use NS-3 Please install ns3 at least version 3.10 (http://www.nsnam.org/releases/)") -endif(HAVE_NS3) +endif() if(HAVE_NS3 AND enable_supernovae) set(enable_supernovae OFF) -endif(HAVE_NS3 AND enable_supernovae) +endif() diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake index f4b57b754d..2e46c9b1e6 100644 --- a/buildtools/Cmake/Modules/FindPCRE.cmake +++ b/buildtools/Cmake/Modules/FindPCRE.cmake @@ -28,25 +28,25 @@ find_path(PATH_PCRE_H "pcre.h" message(STATUS "Looking for pcre.h") if(PATH_PCRE_H) message(STATUS "Looking for pcre.h - found") -else(PATH_PCRE_H) +else() message(STATUS "Looking for pcre.h - not found") -endif(PATH_PCRE_H) +endif() message(STATUS "Looking for lib pcre") if(PATH_PCRE_LIB) message(STATUS "Looking for lib pcre - found") -else(PATH_PCRE_LIB) +else() message(STATUS "Looking for lib pcre - not found") -endif(PATH_PCRE_LIB) +endif() if(PATH_PCRE_LIB AND PATH_PCRE_H) string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATH_PCRE_LIB "${PATH_PCRE_LIB}") string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}") include_directories(${PATH_PCRE_H}) link_directories(${PATH_PCRE_LIB}) -else(PATH_PCRE_LIB) +else() message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.") -endif(PATH_PCRE_LIB AND PATH_PCRE_H) +endif() set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH}) diff --git a/buildtools/Cmake/Modules/FindPcreWin.cmake b/buildtools/Cmake/Modules/FindPcreWin.cmake index 021867d185..8f454fb546 100644 --- a/buildtools/Cmake/Modules/FindPcreWin.cmake +++ b/buildtools/Cmake/Modules/FindPcreWin.cmake @@ -17,26 +17,26 @@ find_path(PATH_PCRE_H "pcre.h" message(STATUS "Looking for pcre.h") if(PATH_PCRE_H) message(STATUS "Looking for pcre.h - found") -else(PATH_PCRE_H) +else() message(STATUS "Looking for pcre.h - not found") -endif(PATH_PCRE_H) +endif() message(STATUS "Looking for lib pcre") if(PATH_PCRE_LIB) message(STATUS "Looking for lib pcre - found") -else(PATH_PCRE_LIB) +else() message(STATUS "Looking for lib pcre - not found") -endif(PATH_PCRE_LIB) +endif() if(PATH_PCRE_LIB AND PATH_PCRE_H) string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}") string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}") if(NOT operation) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ") - endif(NOT operation) -else(PATH_PCRE_LIB) + endif() +else() message(FATAL_ERROR "Please install the pcre package before using SimGrid.") -endif(PATH_PCRE_LIB AND PATH_PCRE_H) +endif() set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH}) diff --git a/buildtools/Cmake/Modules/FindRngStream.cmake b/buildtools/Cmake/Modules/FindRngStream.cmake index c057c27cdb..33e6429e55 100644 --- a/buildtools/Cmake/Modules/FindRngStream.cmake +++ b/buildtools/Cmake/Modules/FindRngStream.cmake @@ -30,10 +30,10 @@ if(HAVE_RNGSTREAM_H) string(REGEX MATCH "-I${HAVE_RNGSTREAM_H} " operation "${CMAKE_C_FLAGS}") if(NOT operation) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_RNGSTREAM_H} ") - endif(NOT operation) -else(HAVE_RNGSTREAM_H) + endif() +else() message(STATUS "Looking for RngStream.h - not found") -endif(HAVE_RNGSTREAM_H) +endif() message(STATUS "Looking for lib rngstreams") if(HAVE_RNGSTREAM_LIB) @@ -42,10 +42,10 @@ if(HAVE_RNGSTREAM_LIB) string(REGEX MATCH "-L${HAVE_RNGSTREAM_LIB} " operation "${CMAKE_C_FLAGS}") if(NOT operation) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${HAVE_RNGSTREAM_LIB} ") - endif(NOT operation) -else(HAVE_RNGSTREAM_LIB) + endif() +else() message(STATUS "Looking for lib rngstreams - not found") -endif(HAVE_RNGSTREAM_LIB) +endif() mark_as_advanced(HAVE_RNGSTREAM_LIB) mark_as_advanced(HAVE_RNGSTREAM_H) \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindRubySimgrid.cmake b/buildtools/Cmake/Modules/FindRubySimgrid.cmake index 742cda25d8..9228fd8637 100644 --- a/buildtools/Cmake/Modules/FindRubySimgrid.cmake +++ b/buildtools/Cmake/Modules/FindRubySimgrid.cmake @@ -2,28 +2,28 @@ include(FindRuby) if(RUBY_EXECUTABLE) message(STATUS "Found ruby: ${RUBY_EXECUTABLE}") -endif(RUBY_EXECUTABLE) +endif() message(STATUS "Looking for ruby.h") if(RUBY_INCLUDE_DIR) message(STATUS "Looking for ruby.h - found") -else(RUBY_INCLUDE_DIR) +else() message(STATUS "Looking for ruby.h - not found") -endif(RUBY_INCLUDE_DIR) +endif() message(STATUS "Looking for confi.h") if(RUBY_CONFIG_INCLUDE_DIR) message(STATUS "Looking for config.h - found") -else(RUBY_CONFIG_INCLUDE_DIR) +else() message(STATUS "Looking for config.h - not found") -endif(RUBY_CONFIG_INCLUDE_DIR) +endif() message(STATUS "Looking for lib ruby") if(RUBY_LIBRARY) message(STATUS "Looking for lib ruby - found") -else(RUBY_LIBRARY) +else() message(STATUS "Looking for lib ruby - not found") -endif(RUBY_LIBRARY) +endif() if(RUBY_LIBRARY) set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}") @@ -32,23 +32,23 @@ if(RUBY_LIBRARY) string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY}) if(NOT RUBY_LIBRARY_NAME) set(RUBY_LIBRARY_NAME ruby) - endif(NOT RUBY_LIBRARY_NAME) + endif() string(REGEX REPLACE "/libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY}) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation) if(NOT operation) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_INCLUDE_DIR} ") #path to ruby.h - endif(NOT operation) + endif() 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") + else() message(STATUS "Warning: Ruby bindings need version 1.9.x, but found 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) + endif() +else() SET(HAVE_RUBY 0) -endif(RUBY_LIBRARY) +endif() if(NOT RUBY_EXECUTABLE) message(STATUS "Warning: you are missing the ruby executable, so you can compile and build examples but can't execute them!") -endif(NOT RUBY_EXECUTABLE) \ No newline at end of file +endif() \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindSimGrid.cmake b/buildtools/Cmake/Modules/FindSimGrid.cmake index d29da73131..67994c7c6b 100644 --- a/buildtools/Cmake/Modules/FindSimGrid.cmake +++ b/buildtools/Cmake/Modules/FindSimGrid.cmake @@ -74,21 +74,21 @@ if(HAVE_SIMGRID_LIB) string(REGEX REPLACE "^${SIMGRID_MINOR_VERSION}." "" SIMGRID_PATCH_VERSION "${SIMGRID_PATCH_VERSION}") string(REGEX REPLACE "^${SIMGRID_MAJOR_VERSION}." "" SIMGRID_MINOR_VERSION "${SIMGRID_MINOR_VERSION}") message(STATUS "Simgrid version : ${SIMGRID_MAJOR_VERSION}.${SIMGRID_MINOR_VERSION}") -else(HAVE_SIMGRID_LIB) +else() message(STATUS "Looking for lib SimGrid - not found") -endif(HAVE_SIMGRID_LIB) +endif() message(STATUS "Looking for gras.h") if(HAVE_GRAS_H) message(STATUS "Looking for gras.h - found") -else(HAVE_GRAS_H) +else() message(STATUS "Looking for gras.h - not found") -endif(HAVE_GRAS_H) +endif() if(HAVE_TESH) message(STATUS "Found Tesh: ${HAVE_TESH}") -endif(HAVE_TESH) +endif() if(HAVE_GRAS_STUB) message(STATUS "Found gras_stub_generator: ${HAVE_GRAS_STUB}") -endif(HAVE_GRAS_STUB) \ No newline at end of file +endif() \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindValgrind.cmake b/buildtools/Cmake/Modules/FindValgrind.cmake index 9cfcfc085a..cbb044ccb8 100644 --- a/buildtools/Cmake/Modules/FindValgrind.cmake +++ b/buildtools/Cmake/Modules/FindValgrind.cmake @@ -13,7 +13,7 @@ if(VALGRIND_EXE) message(STATUS "Found valgrind: ${VALGRIND_EXE}") SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl") SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl") -endif(VALGRIND_EXE) +endif() if(VALGRIND_EXE) exec_program("${VALGRIND_EXE} --version " OUTPUT_VARIABLE "VALGRIND_VERSION") @@ -23,13 +23,13 @@ if(VALGRIND_EXE) exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/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(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}") - else(NEW_VALGRIND_VERSION) + else() set(enable_memcheck false) message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.") - endif(NEW_VALGRIND_VERSION) -else(VALGRIND_EXE) + endif() +else() set(enable_memcheck false) message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.") -endif(VALGRIND_EXE) +endif() mark_as_advanced(VALGRIND_EXE) \ No newline at end of file diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index 9a660662ee..8b723ec072 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -7,9 +7,9 @@ set(ns3_path ${ns3_path} CACHE PATH "Path to ns3 lib and include") if(NOT CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project") -else(NOT CMAKE_INSTALL_PREFIX) +else() set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project") -endif(NOT CMAKE_INSTALL_PREFIX) +endif() set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE) @@ -37,9 +37,9 @@ option(enable_msg_deprecated "This option enable the use of msg deprecated funct if(WIN32) option(enable_smpi "Whether the smpi library is compiled." off) -else(WIN32) +else() option(enable_smpi "Whether the smpi library is compiled." on) -endif(WIN32) +endif() mark_as_advanced(HAVE_SSH) mark_as_advanced(HAVE_RSYNC) diff --git a/buildtools/Cmake/Pipol.cmake b/buildtools/Cmake/Pipol.cmake index a225176063..1d47879514 100644 --- a/buildtools/Cmake/Pipol.cmake +++ b/buildtools/Cmake/Pipol.cmake @@ -10,43 +10,43 @@ IF(pipol_user) if(with_context) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Dwith_context=${with_context}") - endif(with_context) + endif() if(enable_smpi) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_smpi=on") - endif(enable_smpi) + endif() if(enable_lua) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_lua=on") - endif(enable_lua) + endif() if(enable_compile_optimizations) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_compile_optimizations=on") - endif(enable_compile_optimizations) + endif() if(enable_compile_warnings) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_compile_warnings=on") - endif(enable_compile_warnings) + endif() if(enable_tracing) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_tracing=on") - endif(enable_tracing) + endif() if(enable_coverage) set(CMAKE_OPTIONS "${CMAKE_OPTION} -Denable_coverage=on") - endif(enable_coverage) + endif() if(enable_print_message) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_print_message=on") - endif(enable_print_message) + endif() if(enable_model-checking) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_model-checking=on") - endif(enable_model-checking) + endif() if(enable_latency_bound_tracking) set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Denable_latency_bound_tracking=on") - endif(enable_latency_bound_tracking) + endif() FIND_PROGRAM(HAVE_SSH ssh) FIND_PROGRAM(HAVE_RSYNC rsync) @@ -59,7 +59,7 @@ IF(pipol_user) ssh ${pipol_user}@pipol.inria.fr pipol-sub --query=systems OUTPUT_VARIABLE PIPOL_SYSTEMS OUTPUT_STRIP_TRAILING_WHITESPACE) - ENDIF(HAVE_SSH) + ENDIF() ADD_CUSTOM_TARGET(pipol_test_list_images COMMENT "Available images for pipol tests (cmake + make + make test) : " @@ -125,8 +125,8 @@ IF(pipol_user) cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \; ctest -D Experimental \" ) - endif(NOT make_test) - endif(make_test) + endif() + endif() ADD_CUSTOM_COMMAND(TARGET ${SYSTEM_TARGET}_experimental POST_BUILD @@ -141,7 +141,7 @@ IF(pipol_user) ) ENDMACRO(PIPOL_TARGET) - ENDIF(HAVE_RSYNC) + ENDIF() # add a target for each pipol system IF(PIPOL_SYSTEMS) @@ -149,7 +149,7 @@ IF(pipol_user) FOREACH(SYSTEM ${PIPOL_SYSTEMS}) PIPOL_TARGET(${SYSTEM}) ENDFOREACH(SYSTEM ${PIPOL_SYSTEMS}) - ENDIF(PIPOL_SYSTEMS) + ENDIF() ADD_CUSTOM_TARGET(pipol_kill_all_jobs COMMENT "PIPOL delete all jobs" @@ -158,4 +158,4 @@ IF(pipol_user) message(STATUS "Pipol options: ${CMAKE_OPTIONS}") -ENDIF(pipol_user) \ No newline at end of file +ENDIF() \ No newline at end of file diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake index 26e15db2f0..a2dde2f837 100644 --- a/buildtools/Cmake/PrintArgs.cmake +++ b/buildtools/Cmake/PrintArgs.cmake @@ -72,7 +72,7 @@ if(enable_print_message) message("______________________________________________________________________") message("______________________________________________________________________ DEBUG END") message("") -endif(enable_print_message) +endif() message("\nConfiguration of package `simgrid' on arch (=${GRAS_THISARCH}):") message(" BUILDNAME ...........: ${BUILDNAME}") @@ -93,7 +93,7 @@ if(NOT APPLE AND NOT WIN32) message(" Compile NS-3 ........: ${HAVE_NS3}") message(" Gtnets path .........: ${gtnets_path}") message(" NS-3 path ...........: ${ns3_path}") -endif(NOT APPLE AND NOT WIN32) +endif() message(" Compile Lua .........: ${HAVE_LUA}") message(" Compile Smpi ........: ${HAVE_SMPI}") message(" Compile Smpi f77 ....: ${SMPI_F2C}") diff --git a/buildtools/Cmake/Supernovae.cmake b/buildtools/Cmake/Supernovae.cmake index d6a32653d2..ec68d3cd24 100644 --- a/buildtools/Cmake/Supernovae.cmake +++ b/buildtools/Cmake/Supernovae.cmake @@ -68,4 +68,4 @@ if (enable_supernovae) # I need supernovae set(SMPI_SRC ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) -endif(enable_supernovae) # I need supernovae +endif() # I need supernovae diff --git a/buildtools/Cmake/UnitTesting.cmake b/buildtools/Cmake/UnitTesting.cmake index c08425471c..746596e7a7 100644 --- a/buildtools/Cmake/UnitTesting.cmake +++ b/buildtools/Cmake/UnitTesting.cmake @@ -59,8 +59,8 @@ add_executable(testall ${TEST_UNITS}) ### Add definitions for compile if(NOT WIN32) target_link_libraries(testall gras m) -else(NOT WIN32) +else() target_link_libraries(testall gras) -endif(NOT WIN32) +endif() add_dependencies(testall ${TEST_UNITS}) \ No newline at end of file diff --git a/buildtools/pipol/CtestPipol.cmake b/buildtools/pipol/CtestPipol.cmake index f46507d959..b6c2291c27 100755 --- a/buildtools/pipol/CtestPipol.cmake +++ b/buildtools/pipol/CtestPipol.cmake @@ -31,11 +31,11 @@ set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full -- if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn) SET(CTEST_UPDATE_COMMAND "/usr/bin/svn") -endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn) +endif() if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git) SET(CTEST_UPDATE_COMMAND "/usr/bin/git") -endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git) +endif() SET(CTEST_DROP_METHOD "http") SET(CTEST_DROP_SITE "cdash.inria.fr/CDash") @@ -174,7 +174,7 @@ IF(${ARCH_32_BITS}) amok-bandwidth-sg-32 amok-saturate-sg-32 ) -ELSE(${ARCH_32_BITS}) +ELSE() SET(CTEST_CUSTOM_MEMCHECK_IGNORE ${CTEST_CUSTOM_MEMCHECK_IGNORE} tesh-gras-msg_handle-sg-64 @@ -192,7 +192,7 @@ ELSE(${ARCH_32_BITS}) amok-bandwidth-sg-64 amok-saturate-sg-64 ) -ENDIF(${ARCH_32_BITS}) +ENDIF() if(HAVE_GTNETS) SET(CTEST_CUSTOM_MEMCHECK_IGNORE @@ -203,7 +203,7 @@ if(HAVE_GTNETS) msg-gtnets4 msg-gtnets5 ) -endif(HAVE_GTNETS) +endif() if(HAVE_JAVA) SET(CTEST_CUSTOM_MEMCHECK_IGNORE @@ -213,7 +213,7 @@ if(HAVE_JAVA) java-comm_time java-suspend ) -endif(HAVE_JAVA) +endif() ctest_start(Experimental) ctest_update(SOURCE "${CTEST_SOURCE_DIRECTORY}") diff --git a/doc/HelloWorld/CMakeLists.txt b/doc/HelloWorld/CMakeLists.txt index a63cd2c833..99c2b582f3 100644 --- a/doc/HelloWorld/CMakeLists.txt +++ b/doc/HelloWorld/CMakeLists.txt @@ -5,9 +5,9 @@ cmake_minimum_required(VERSION 2.8) if(WIN32) SET(CMAKE_RC_COMPILER "windres") set(LIBRARIES_DEP simgrid pcre ws2_32 pthread) -else(WIN32) +else() set(LIBRARIES_DEP simgrid pcre pthread) -endif(WIN32) +endif() project(MY_SIMGRID_PROJECT C) @@ -22,13 +22,13 @@ message(STATUS "Looking for lib Simgrid") if("$ENV{SIMGRID_ROOT}" STREQUAL "") message(STATUS "Looking for lib Simgrid - Not found") message(FATAL_ERROR "Simgrid not found, reinstall it or set SIMGRID_ROOT") -else("$ENV{SIMGRID_ROOT}" STREQUAL "") +else() link_directories($ENV{SIMGRID_ROOT}/lib) include_directories($ENV{SIMGRID_ROOT}/include) include_directories($ENV{SIMGRID_ROOT}/src) include_directories($ENV{SIMGRID_ROOT}/src/include) message(STATUS "Looking for lib Simgrid - found") -endif("$ENV{SIMGRID_ROOT}" STREQUAL "") +endif() ################ # FIND TARGETS # diff --git a/doc/HelloWorld/FindPcreWin.cmake b/doc/HelloWorld/FindPcreWin.cmake index 871b144831..d4628ea12c 100644 --- a/doc/HelloWorld/FindPcreWin.cmake +++ b/doc/HelloWorld/FindPcreWin.cmake @@ -17,28 +17,28 @@ find_path(PATH_PCRE_H "pcre.h" message(STATUS "Looking for pcre.h") if(PATH_PCRE_H) message(STATUS "Looking for pcre.h - found") -else(PATH_PCRE_H) +else() message(STATUS "Looking for pcre.h - not found") -endif(PATH_PCRE_H) +endif() message(STATUS "Looking for lib pcre") if(PATH_PCRE_LIB) message(STATUS "Looking for lib pcre - found") -else(PATH_PCRE_LIB) +else() message(STATUS "Looking for lib pcre - not found") -endif(PATH_PCRE_LIB) +endif() if(PATH_PCRE_LIB AND PATH_PCRE_H) string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}") string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}") if(NOT operation) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ") - endif(NOT operation) + endif() string(REGEX REPLACE "/libpcre.dll" "" PATH_PCRE_LIB "${PATH_PCRE_LIB}") link_directories(${PATH_PCRE_LIB}) -else(PATH_PCRE_LIB) +else() message(FATAL_ERROR "Please install the pcre package before using SimGrid.") -endif(PATH_PCRE_LIB AND PATH_PCRE_H) +endif() mark_as_advanced(PATH_PCRE_H) mark_as_advanced(PATH_PCRE_LIB) \ No newline at end of file diff --git a/examples/amok/bandwidth/CMakeLists.txt b/examples/amok/bandwidth/CMakeLists.txt index 9ce7683cbb..5d657fd3e4 100644 --- a/examples/amok/bandwidth/CMakeLists.txt +++ b/examples/amok/bandwidth/CMakeLists.txt @@ -26,11 +26,11 @@ if(NOT WIN32) target_link_libraries(bandwidth_simulator simgrid pthread m) target_link_libraries(bandwidth_maestro gras pthread m) target_link_libraries(bandwidth_sensor gras pthread m) -else(NOT WIN32) +else() target_link_libraries(bandwidth_simulator simgrid) target_link_libraries(bandwidth_maestro gras) target_link_libraries(bandwidth_sensor gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/amok/saturate/CMakeLists.txt b/examples/amok/saturate/CMakeLists.txt index cd87c37018..aec9f8c6b2 100644 --- a/examples/amok/saturate/CMakeLists.txt +++ b/examples/amok/saturate/CMakeLists.txt @@ -26,11 +26,11 @@ if(NOT WIN32) target_link_libraries(saturate_simulator simgrid pthread m) target_link_libraries(saturate_maestro gras pthread m) target_link_libraries(saturate_sensor gras pthread m) -else(NOT WIN32) +else() target_link_libraries(saturate_simulator simgrid) target_link_libraries(saturate_maestro gras) target_link_libraries(saturate_sensor gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/all2all/CMakeLists.txt b/examples/gras/all2all/CMakeLists.txt index 82b7c2fe48..18b5c1d810 100644 --- a/examples/gras/all2all/CMakeLists.txt +++ b/examples/gras/all2all/CMakeLists.txt @@ -26,11 +26,11 @@ if(NOT WIN32) target_link_libraries(all2all_simulator simgrid pthread m) target_link_libraries(all2all_sender gras pthread m) target_link_libraries(all2all_receiver gras pthread m) -else(NOT WIN32) +else() target_link_libraries(all2all_simulator simgrid) target_link_libraries(all2all_sender gras) target_link_libraries(all2all_receiver gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/chrono/CMakeLists.txt b/examples/gras/chrono/CMakeLists.txt index 06d094be7e..218d24f15d 100644 --- a/examples/gras/chrono/CMakeLists.txt +++ b/examples/gras/chrono/CMakeLists.txt @@ -21,10 +21,10 @@ add_custom_command( if(NOT WIN32) target_link_libraries(chrono_simulator simgrid pthread m ) target_link_libraries(chrono_multiplier gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(chrono_simulator simgrid) target_link_libraries(chrono_multiplier gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/console/CMakeLists.txt b/examples/gras/console/CMakeLists.txt index f8989af6ab..e27e4449be 100644 --- a/examples/gras/console/CMakeLists.txt +++ b/examples/gras/console/CMakeLists.txt @@ -39,7 +39,7 @@ if(HAVE_LUA) target_link_libraries(ping_simulator_console simgrid pthread m) target_link_libraries(ping_client_console gras simgrid pthread m) target_link_libraries(ping_server_console gras simgrid pthread m) -endif(HAVE_LUA) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/mmrpc/CMakeLists.txt b/examples/gras/mmrpc/CMakeLists.txt index e8b2bc8550..4ccd6719a9 100644 --- a/examples/gras/mmrpc/CMakeLists.txt +++ b/examples/gras/mmrpc/CMakeLists.txt @@ -36,11 +36,11 @@ if(NOT WIN32) target_link_libraries(mmrpc_simulator simgrid pthread m ) target_link_libraries(mmrpc_client gras pthread m ) target_link_libraries(mmrpc_server gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(mmrpc_simulator simgrid) target_link_libraries(mmrpc_client gras) target_link_libraries(mmrpc_server gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt index c1e24c0d31..2166f97136 100644 --- a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt +++ b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt @@ -22,10 +22,10 @@ add_custom_command( if(NOT WIN32) target_link_libraries(simple_token_simulator simgrid pthread m ) target_link_libraries(simple_token_node gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(simple_token_simulator simgrid) target_link_libraries(simple_token_node gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/ping/CMakeLists.txt b/examples/gras/ping/CMakeLists.txt index e2caa08b65..4ba3de8461 100644 --- a/examples/gras/ping/CMakeLists.txt +++ b/examples/gras/ping/CMakeLists.txt @@ -36,11 +36,11 @@ if(NOT WIN32) target_link_libraries(ping_simulator simgrid pthread m ) target_link_libraries(ping_client gras pthread m ) target_link_libraries(ping_server gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(ping_simulator simgrid) target_link_libraries(ping_client gras) target_link_libraries(ping_server gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/pmm/CMakeLists.txt b/examples/gras/pmm/CMakeLists.txt index c894a0d3c1..46d8db7b81 100644 --- a/examples/gras/pmm/CMakeLists.txt +++ b/examples/gras/pmm/CMakeLists.txt @@ -26,11 +26,11 @@ if(NOT WIN32) target_link_libraries(pmm_simulator simgrid pthread m ) target_link_libraries(pmm_slave gras pthread m ) target_link_libraries(pmm_master gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(pmm_simulator simgrid) target_link_libraries(pmm_slave gras) target_link_libraries(pmm_master gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/properties/CMakeLists.txt b/examples/gras/properties/CMakeLists.txt index 90debfdf52..946cf6c0cd 100644 --- a/examples/gras/properties/CMakeLists.txt +++ b/examples/gras/properties/CMakeLists.txt @@ -26,11 +26,11 @@ if(NOT WIN32) target_link_libraries(properties_simulator simgrid pthread m ) target_link_libraries(properties_alice gras pthread m ) target_link_libraries(properties_bob gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(properties_simulator simgrid) target_link_libraries(properties_alice gras) target_link_libraries(properties_bob gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/rpc/CMakeLists.txt b/examples/gras/rpc/CMakeLists.txt index 42c9aaab19..063bb93a89 100644 --- a/examples/gras/rpc/CMakeLists.txt +++ b/examples/gras/rpc/CMakeLists.txt @@ -30,12 +30,12 @@ if(NOT WIN32) target_link_libraries(rpc_client gras pthread m ) target_link_libraries(rpc_forwarder gras pthread m ) target_link_libraries(rpc_server gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(rpc_simulator simgrid) target_link_libraries(rpc_client gras) target_link_libraries(rpc_forwarder gras) target_link_libraries(rpc_server gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/spawn/CMakeLists.txt b/examples/gras/spawn/CMakeLists.txt index d711cd8ba7..05f146d706 100644 --- a/examples/gras/spawn/CMakeLists.txt +++ b/examples/gras/spawn/CMakeLists.txt @@ -22,10 +22,10 @@ add_custom_command( if(NOT WIN32) target_link_libraries(spawn_simulator simgrid pthread m ) target_link_libraries(spawn_server gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(spawn_simulator simgrid) target_link_libraries(spawn_server gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/synchro/CMakeLists.txt b/examples/gras/synchro/CMakeLists.txt index 3490e4613f..6191bdfda1 100644 --- a/examples/gras/synchro/CMakeLists.txt +++ b/examples/gras/synchro/CMakeLists.txt @@ -22,10 +22,10 @@ add_custom_command( if(NOT WIN32) target_link_libraries(synchro_simulator simgrid pthread m ) target_link_libraries(synchro_philosopher gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(synchro_simulator simgrid) target_link_libraries(synchro_philosopher gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/gras/timer/CMakeLists.txt b/examples/gras/timer/CMakeLists.txt index 86c42b7c8b..e41e5c5ea2 100644 --- a/examples/gras/timer/CMakeLists.txt +++ b/examples/gras/timer/CMakeLists.txt @@ -22,10 +22,10 @@ add_custom_command( if(NOT WIN32) target_link_libraries(timer_simulator simgrid pthread m ) target_link_libraries(timer_client gras pthread m ) -else(NOT WIN32) +else() target_link_libraries(timer_simulator simgrid) target_link_libraries(timer_client gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/msg/cloud/CMakeLists.txt b/examples/msg/cloud/CMakeLists.txt index 8372f4545c..c06ebfaa0e 100644 --- a/examples/msg/cloud/CMakeLists.txt +++ b/examples/msg/cloud/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(masterslave_virtual_machines "masterslave_virtual_machines.c") ### Add definitions for compile if(WIN32) target_link_libraries(masterslave_virtual_machines simgrid ) -else(WIN32) +else() target_link_libraries(masterslave_virtual_machines simgrid m) -endif(WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/msg/io/CMakeLists.txt b/examples/msg/io/CMakeLists.txt index 7036f56cf9..d3f612e3f0 100644 --- a/examples/msg/io/CMakeLists.txt +++ b/examples/msg/io/CMakeLists.txt @@ -9,10 +9,10 @@ add_executable(file_unlink file_unlink.c) if(NOT WIN32) target_link_libraries(file simgrid m pthread) target_link_libraries(file_unlink simgrid m pthread) -else(NOT WIN32) +else() target_link_libraries(file simgrid) target_link_libraries(file_unlink simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index e68e0da4c0..b062bf8316 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -24,7 +24,7 @@ if(WIN32) target_link_libraries(masterslave_arg simgrid ) target_link_libraries(masterslave_platfgen simgrid ) target_link_libraries(masterslave_failure_platfgen simgrid ) -else(WIN32) +else() target_link_libraries(masterslave_forwarder simgrid m ) target_link_libraries(masterslave_failure simgrid m ) target_link_libraries(masterslave_mailbox simgrid m ) @@ -34,7 +34,7 @@ else(WIN32) target_link_libraries(masterslave_arg simgrid m ) target_link_libraries(masterslave_platfgen simgrid m ) target_link_libraries(masterslave_failure_platfgen simgrid m ) -endif(WIN32) +endif() target_link_libraries(masterslave_cluster simgrid) set(tesh_files diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt index 47fce16b79..5e267988b7 100644 --- a/examples/msg/mc/CMakeLists.txt +++ b/examples/msg/mc/CMakeLists.txt @@ -23,7 +23,7 @@ if(HAVE_MC) target_link_libraries(bugged2_liveness simgrid m ) target_link_libraries(test/test_heap_comparison simgrid m ) -endif(HAVE_MC) +endif() set(tesh_files ${tesh_files} diff --git a/examples/msg/ns3/CMakeLists.txt b/examples/msg/ns3/CMakeLists.txt index 6b8fa3024f..a32eb655f7 100644 --- a/examples/msg/ns3/CMakeLists.txt +++ b/examples/msg/ns3/CMakeLists.txt @@ -7,7 +7,7 @@ if(HAVE_NS3) ### Add definitions for compile target_link_libraries(ns3 simgrid m ) -endif(HAVE_NS3) +endif() set(tesh_files ${tesh_files} diff --git a/examples/msg/start_kill_time/CMakeLists.txt b/examples/msg/start_kill_time/CMakeLists.txt index 8c8ce6a4b7..7f291d08db 100644 --- a/examples/msg/start_kill_time/CMakeLists.txt +++ b/examples/msg/start_kill_time/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(sk_time "sk_time.c") ### Add definitions for compile if(WIN32) target_link_libraries(sk_time simgrid ) -else(WIN32) +else() target_link_libraries(sk_time simgrid m ) -endif(WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/msg/token_ring/CMakeLists.txt b/examples/msg/token_ring/CMakeLists.txt index c87894efe6..f3e07d48c2 100644 --- a/examples/msg/token_ring/CMakeLists.txt +++ b/examples/msg/token_ring/CMakeLists.txt @@ -9,10 +9,10 @@ add_executable(token_bypass token_bypass.c) if(NOT WIN32) target_link_libraries(token_ring simgrid m pthread ) target_link_libraries(token_bypass simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(token_ring simgrid) target_link_libraries(token_bypass simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt index 99c04491cc..f177544060 100644 --- a/examples/msg/tracing/CMakeLists.txt +++ b/examples/msg/tracing/CMakeLists.txt @@ -29,7 +29,7 @@ if(HAVE_TRACING) PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;" ) -endif(HAVE_TRACING) +endif() set(tesh_files ${tesh_files} diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 02e1579ee9..a3525c5682 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT WIN32) PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test") -else(NOT WIN32) +else() target_link_libraries(ex_sd_test simgrid) target_link_libraries(sd_test2 simgrid) target_link_libraries(sd_fail simgrid) @@ -51,7 +51,7 @@ else(NOT WIN32) set_directory_properties( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe") -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt index 5711972f46..585e989432 100644 --- a/examples/simdag/dax/CMakeLists.txt +++ b/examples/simdag/dax/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(dax_test dax_test.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(dax_test simgrid pthread m ) -else(NOT WIN32) +else() target_link_libraries(dax_test simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/simdag/dot/CMakeLists.txt b/examples/simdag/dot/CMakeLists.txt index 09ccb85b76..eaabdf8e40 100644 --- a/examples/simdag/dot/CMakeLists.txt +++ b/examples/simdag/dot/CMakeLists.txt @@ -18,15 +18,15 @@ if(HAVE_GRAPHVIZ) PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/dot_test; ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot;") - else(NOT WIN32) + else() target_link_libraries(dot_test simgrid) #target_link_libraries( ) target_link_libraries(simulate_dot simgrid) #target_link_libraries( ) target_link_libraries(dot_test2 simgrid) #target_link_libraries( ) set_directory_properties( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/dot_test; ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot;") - endif(NOT WIN32) -endif(HAVE_GRAPHVIZ) + endif() +endif() set(tesh_files ${tesh_files} diff --git a/examples/simdag/goal/CMakeLists.txt b/examples/simdag/goal/CMakeLists.txt index feab0542d1..c6267e4927 100644 --- a/examples/simdag/goal/CMakeLists.txt +++ b/examples/simdag/goal/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(goal_test goal_test.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(goal_test simgrid pthread m ) -else(NOT WIN32) +else() target_link_libraries(goal_test simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/simdag/metaxml/CMakeLists.txt b/examples/simdag/metaxml/CMakeLists.txt index a7150cdcbc..3f0417fca7 100644 --- a/examples/simdag/metaxml/CMakeLists.txt +++ b/examples/simdag/metaxml/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(sd_meta sd_meta.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(sd_meta simgrid pthread m ) -else(NOT WIN32) +else() target_link_libraries(sd_meta simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt index c7b5192ca1..04e4cce888 100644 --- a/examples/simdag/properties/CMakeLists.txt +++ b/examples/simdag/properties/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(sd_prop sd_prop.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(sd_prop simgrid pthread m ) -else(NOT WIN32) +else() target_link_libraries(sd_prop simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/simdag/scheduling/CMakeLists.txt b/examples/simdag/scheduling/CMakeLists.txt index 7e07f06097..c562c144e8 100644 --- a/examples/simdag/scheduling/CMakeLists.txt +++ b/examples/simdag/scheduling/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(minmin_test minmin_test.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(minmin_test simgrid pthread m) -else(NOT WIN32) +else() target_link_libraries(minmin_test simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index ad50c21c49..eaeb8d03c8 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -24,7 +24,7 @@ if(enable_smpi) target_link_libraries(mc_bugged2 m simgrid smpi ) target_link_libraries(smpi_replay m simgrid smpi ) -endif(enable_smpi) +endif() set(tesh_files ${tesh_files} diff --git a/examples/smpi/MM/CMakeLists.txt b/examples/smpi/MM/CMakeLists.txt index f61e470054..af62a30ab1 100644 --- a/examples/smpi/MM/CMakeLists.txt +++ b/examples/smpi/MM/CMakeLists.txt @@ -12,10 +12,10 @@ add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(MM_mpi simgrid pthread m smpi) -else(NOT WIN32) +else() target_link_libraries(MM_mpi simgrid smpi) -endif(NOT WIN32) -endif(enable_smpi) +endif() +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/gras/datadesc/CMakeLists.txt b/teshsuite/gras/datadesc/CMakeLists.txt index 7d80a671d8..1693115c20 100644 --- a/teshsuite/gras/datadesc/CMakeLists.txt +++ b/teshsuite/gras/datadesc/CMakeLists.txt @@ -7,7 +7,7 @@ if(NOT WIN32) ### Add definitions for compile target_link_libraries(datadesc_usage gras m pthread) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/gras/empty_main/CMakeLists.txt b/teshsuite/gras/empty_main/CMakeLists.txt index 49e5079fab..7439d20e98 100644 --- a/teshsuite/gras/empty_main/CMakeLists.txt +++ b/teshsuite/gras/empty_main/CMakeLists.txt @@ -23,10 +23,10 @@ add_custom_command( if(NOT WIN32) target_link_libraries(empty_main_simulator simgrid m pthread) target_link_libraries(empty_main_function gras m pthread) -else(NOT WIN32) +else() target_link_libraries(empty_main_simulator simgrid) target_link_libraries(empty_main_function gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/gras/msg_handle/CMakeLists.txt b/teshsuite/gras/msg_handle/CMakeLists.txt index 63d5d19b89..7f5a91603e 100644 --- a/teshsuite/gras/msg_handle/CMakeLists.txt +++ b/teshsuite/gras/msg_handle/CMakeLists.txt @@ -28,11 +28,11 @@ if(NOT WIN32) target_link_libraries(msg_handle_simulator simgrid m pthread ) target_link_libraries(msg_handle_client gras m pthread ) target_link_libraries(msg_handle_server gras m pthread ) -else(NOT WIN32) +else() target_link_libraries(msg_handle_simulator simgrid) target_link_libraries(msg_handle_client gras) target_link_libraries(msg_handle_server gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/gras/numerous_rpc/CMakeLists.txt b/teshsuite/gras/numerous_rpc/CMakeLists.txt index 129d3e13aa..9c155aa423 100644 --- a/teshsuite/gras/numerous_rpc/CMakeLists.txt +++ b/teshsuite/gras/numerous_rpc/CMakeLists.txt @@ -23,10 +23,10 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_numerous_rpc_s if(NOT WIN32) target_link_libraries(numerous_rpc_client gras m pthread ) target_link_libraries(numerous_rpc_server gras m pthread ) -else(NOT WIN32) +else() target_link_libraries(numerous_rpc_client gras) target_link_libraries(numerous_rpc_server gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/gras/small_sleep/CMakeLists.txt b/teshsuite/gras/small_sleep/CMakeLists.txt index 8820c5b5e2..e215f2e38c 100644 --- a/teshsuite/gras/small_sleep/CMakeLists.txt +++ b/teshsuite/gras/small_sleep/CMakeLists.txt @@ -23,10 +23,10 @@ add_custom_command( if(NOT WIN32) target_link_libraries(small_sleep_simulator simgrid m pthread) target_link_libraries(small_sleep_function gras m pthread) -else(NOT WIN32) +else() target_link_libraries(small_sleep_simulator simgrid) target_link_libraries(small_sleep_function gras) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index 8b0c5e3f97..4f22b3c611 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(get_sender ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(get_sender simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(get_sender simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index c930be9fde..32d833481a 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -21,7 +21,7 @@ if(NOT WIN32) target_link_libraries(basic5 simgrid m pthread ) target_link_libraries(basic6 simgrid m pthread ) target_link_libraries(incomplete simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(basic0 simgrid) target_link_libraries(basic1 simgrid) target_link_libraries(basic2 simgrid) @@ -30,7 +30,7 @@ else(NOT WIN32) target_link_libraries(basic5 simgrid) target_link_libraries(basic6 simgrid) target_link_libraries(incomplete simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/simdag/network/CMakeLists.txt b/teshsuite/simdag/network/CMakeLists.txt index 4417d1035b..a89ec1cbe4 100644 --- a/teshsuite/simdag/network/CMakeLists.txt +++ b/teshsuite/simdag/network/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(test_reinit_costs test_reinit_costs.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(test_reinit_costs simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(test_reinit_costs simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/simdag/network/mxn/CMakeLists.txt b/teshsuite/simdag/network/mxn/CMakeLists.txt index 35fdb68eca..e25af1cf78 100644 --- a/teshsuite/simdag/network/mxn/CMakeLists.txt +++ b/teshsuite/simdag/network/mxn/CMakeLists.txt @@ -11,11 +11,11 @@ if(NOT WIN32) target_link_libraries(test_intra_all2all simgrid m pthread ) target_link_libraries(test_intra_independent_comm simgrid m pthread ) target_link_libraries(test_intra_scatter simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(test_intra_all2all simgrid) target_link_libraries(test_intra_independent_comm simgrid) target_link_libraries(test_intra_scatter simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/simdag/network/p2p/CMakeLists.txt b/teshsuite/simdag/network/p2p/CMakeLists.txt index f1a5abfcb9..d511b08a89 100644 --- a/teshsuite/simdag/network/p2p/CMakeLists.txt +++ b/teshsuite/simdag/network/p2p/CMakeLists.txt @@ -13,12 +13,12 @@ if(NOT WIN32) target_link_libraries(test_latency2 simgrid m pthread ) target_link_libraries(test_latency3 simgrid m pthread ) target_link_libraries(test_latency_bound simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(test_latency1 simgrid) target_link_libraries(test_latency2 simgrid) target_link_libraries(test_latency3 simgrid) target_link_libraries(test_latency_bound simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/simdag/partask/CMakeLists.txt b/teshsuite/simdag/partask/CMakeLists.txt index 0a02f18569..1d57c19cb6 100644 --- a/teshsuite/simdag/partask/CMakeLists.txt +++ b/teshsuite/simdag/partask/CMakeLists.txt @@ -9,10 +9,10 @@ add_executable(test_comp_only_par test_comp_only_par.c) if(NOT WIN32) target_link_libraries(test_comp_only_seq simgrid m pthread ) target_link_libraries(test_comp_only_par simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(test_comp_only_seq simgrid) target_link_libraries(test_comp_only_par simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 4a478fd568..5c34236310 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -19,13 +19,13 @@ if(NOT WIN32) target_link_libraries(flatifier simgrid m) target_link_libraries(basic_tracing simgrid m) target_link_libraries(basic_link_test simgrid m) -else(NOT WIN32) +else() target_link_libraries(basic_parsing_test simgrid) target_link_libraries(is_router_test simgrid) target_link_libraries(flatifier simgrid) target_link_libraries(basic_tracing simgrid) target_link_libraries(basic_link_test simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index a743421b15..6d9731a6d5 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -48,7 +48,7 @@ if(enable_smpi) target_link_libraries(struct_test m simgrid smpi ) set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv) -endif(enable_smpi) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt index 9c883591b7..a4a7eb32aa 100644 --- a/teshsuite/xbt/CMakeLists.txt +++ b/teshsuite/xbt/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(log_large_test log_large_test.c) add_executable(parallel_log_crashtest parallel_log_crashtest.c) if(HAVE_MMAP) add_executable(mmalloc_test mmalloc_test.c) -endif(HAVE_MMAP) +endif() ### Add definitions for compile if(NOT WIN32) @@ -14,14 +14,14 @@ if(NOT WIN32) target_link_libraries(parallel_log_crashtest gras m pthread ) if(HAVE_MMAP) target_link_libraries(mmalloc_test gras m pthread ) - endif(HAVE_MMAP) -else(NOT WIN32) + endif() +else() target_link_libraries(log_large_test gras) target_link_libraries(parallel_log_crashtest gras) if(HAVE_MMAP) target_link_libraries(mmalloc_test gras) - endif(HAVE_MMAP) -endif(NOT WIN32) + endif() +endif() set(tesh_files ${tesh_files} diff --git a/testsuite/surf/CMakeLists.txt b/testsuite/surf/CMakeLists.txt index 49addbc7ec..f9eee1c2cf 100644 --- a/testsuite/surf/CMakeLists.txt +++ b/testsuite/surf/CMakeLists.txt @@ -15,14 +15,14 @@ if(NOT WIN32) target_link_libraries(surf_usage simgrid m ) target_link_libraries(surf_usage2 simgrid m ) target_link_libraries(trace_usage simgrid m ) -else(NOT WIN32) +else() target_link_libraries(lmm_usage simgrid ) target_link_libraries(maxmin_bench simgrid ) set_target_properties(maxmin_bench PROPERTIES COMPILE_FLAGS "-DDLL_STATIC") target_link_libraries(surf_usage simgrid ) target_link_libraries(surf_usage2 simgrid ) target_link_libraries(trace_usage simgrid ) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/testsuite/xbt/CMakeLists.txt b/testsuite/xbt/CMakeLists.txt index b0e8ffd1dd..9d3c6273c1 100644 --- a/testsuite/xbt/CMakeLists.txt +++ b/testsuite/xbt/CMakeLists.txt @@ -13,12 +13,12 @@ if(NOT WIN32) target_link_libraries(graphxml_usage simgrid m ) target_link_libraries(heap_bench gras m ) target_link_libraries(parmap_bench simgrid m ) -else(NOT WIN32) +else() target_link_libraries(log_usage gras ) target_link_libraries(graphxml_usage simgrid ) target_link_libraries(heap_bench gras ) target_link_libraries(parmap_bench simgrid ) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/tools/graphicator/CMakeLists.txt b/tools/graphicator/CMakeLists.txt index a17561fa95..b62d22ab40 100644 --- a/tools/graphicator/CMakeLists.txt +++ b/tools/graphicator/CMakeLists.txt @@ -7,9 +7,9 @@ add_executable(graphicator graphicator.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(graphicator simgrid m pthread ) -else(NOT WIN32) +else() target_link_libraries(graphicator simgrid ) -endif(NOT WIN32) +endif() ## Clean generated files get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) diff --git a/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt index eb9301ccae..f95e278f2c 100644 --- a/tools/gras/CMakeLists.txt +++ b/tools/gras/CMakeLists.txt @@ -9,10 +9,10 @@ add_executable(struct_diff struct_diff.c) if(NOT WIN32) target_link_libraries(gras_stub_generator simgrid pthread m) target_link_libraries(struct_diff simgrid pthread m) -else(NOT WIN32) +else() target_link_libraries(gras_stub_generator simgrid) target_link_libraries(struct_diff simgrid) -endif(NOT WIN32) +endif() set(tesh_files ${tesh_files} diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt index 85bd62dbf2..d91a3492f5 100644 --- a/tools/tesh/CMakeLists.txt +++ b/tools/tesh/CMakeLists.txt @@ -6,14 +6,14 @@ if(WIN32) COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl" COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh ) -else(WIN32) +else() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") add_executable(tesh tesh.c run_context.c signal.c) ### Add definitions for compile target_link_libraries(tesh gras m pthread) -endif(WIN32) +endif() set(tesh_files ${tesh_files} -- 2.20.1