From: Arnaud Giersch Date: Fri, 26 Oct 2012 14:55:05 +0000 (+0200) Subject: Remove conditions from else() and endif() in cmake file. X-Git-Tag: v3_9_rc1~91^2~194 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/588eef405b9b0cfaf52a7949de146776ff350b1e?ds=sidebyside Remove conditions from else() and endif() in cmake file. This is a followup for commit c5c1970 (these statements were added after that). --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a1a3abab..d5fb1132a3 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 Fortran) set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 93f7d7eeba..a5d5958a60 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -500,7 +500,7 @@ if(NOT enable_memcheck) set_tests_properties(smpi-mpich-env-raw smpi-mpich-context-raw smpi-mpich-pt2pt-raw smpi-mpich-coll-raw smpi-mpich-profile-raw PROPERTIES PASS_REGULAR_EXPRESSION "-- No differences found; test successful") - 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) diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake index 19fb44673b..cb29b3d577 100644 --- a/buildtools/Cmake/MakeLibWin.cmake +++ b/buildtools/Cmake/MakeLibWin.cmake @@ -9,7 +9,7 @@ set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL if(enable_smpi) add_library(smpi SHARED ${SMPI_SRC}) set_target_properties(smpi PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsmpi_version} OUTPUT_NAME "smpi") -endif(enable_smpi) +endif() # libpthreadGC2.dll if(ARCH_32_BITS) @@ -44,7 +44,7 @@ target_link_libraries(simgrid ${SIMGRID_DEP}) if(enable_smpi) add_dependencies(smpi simgrid) target_link_libraries(smpi ${SMPI_DEP}) -endif(enable_smpi) +endif() find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS) message(STATUS "pexports: ${PEXPORTS_PATH}") diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index b268d02a63..4f8d6218d8 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") - else(WIN32) + else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - endif(WIN32) + endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index 925bf1a595..8c9d40d590 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") - else(WIN32) + else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - endif(WIN32) + endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") diff --git a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt index a121c7e392..cce0e0b308 100644 --- a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt @@ -44,7 +44,7 @@ if(enable_smpi) add_executable(assocf assocf.f) add_executable(allgatherf allgatherf.f) add_executable(bcastlog bcastlog.f) - endif(SMPI_F2C) + endif() target_link_libraries(coll1 m simgrid smpi ) target_link_libraries(coll2 m simgrid smpi ) @@ -80,7 +80,7 @@ if(enable_smpi) target_link_libraries(assocf m simgrid smpi ) target_link_libraries(allgatherf m simgrid smpi ) target_link_libraries(bcastlog m simgrid smpi ) - endif(SMPI_F2C) + endif() set_target_properties(coll1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(coll2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") @@ -116,9 +116,9 @@ if(enable_smpi) set_target_properties(assocf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(allgatherf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(bcastlog PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - endif(SMPI_F2C) + endif() -endif(enable_smpi) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/smpi/mpich-test/context/CMakeLists.txt b/teshsuite/smpi/mpich-test/context/CMakeLists.txt index e9f13270d4..db189a0dff 100644 --- a/teshsuite/smpi/mpich-test/context/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/context/CMakeLists.txt @@ -22,7 +22,7 @@ if(enable_smpi) if(SMPI_F2C) #add_executable(attrtest_f attrtest.f) #add_executable(commnames_f commnamesf.f) - endif(SMPI_F2C) + endif() target_link_libraries(attrerr m simgrid smpi ) # target_link_libraries(attrt m simgrid smpi ) @@ -37,7 +37,7 @@ if(enable_smpi) if(SMPI_F2C) #target_link_libraries(attrtest_f m simgrid smpi f2c) #target_link_libraries(commnames_f m simgrid smpi f2c) - endif(SMPI_F2C) + endif() set_target_properties(attrerr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") # set_target_properties(attrt PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") @@ -53,9 +53,9 @@ if(enable_smpi) if(SMPI_F2C) #set_target_properties(commnames_f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}" ) #set_target_properties(attrtest_f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}" ) - endif(SMPI_F2C) + endif() -endif(enable_smpi) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/smpi/mpich-test/env/CMakeLists.txt b/teshsuite/smpi/mpich-test/env/CMakeLists.txt index b671596b17..69f5b63662 100644 --- a/teshsuite/smpi/mpich-test/env/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/env/CMakeLists.txt @@ -25,7 +25,7 @@ if(enable_smpi) # add_executable(errhandf errhandf.f) # add_executable(errstringsf errstringsf.f) add_executable(getprocf getprocf.f) - endif(SMPI_F2C) + endif() target_link_libraries(init m simgrid smpi ) target_link_libraries(timers m simgrid smpi ) target_link_libraries(timertest m simgrid smpi ) @@ -41,7 +41,7 @@ if(enable_smpi) # target_link_libraries(errhandf m simgrid smpi ) # target_link_libraries(errstringsf m simgrid smpi ) target_link_libraries(getprocf m simgrid smpi ) - endif(SMPI_F2C) + endif() set_target_properties(timers PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(timers PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") @@ -58,8 +58,8 @@ if(enable_smpi) # set_target_properties(errhandf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") # set_target_properties(errstringsf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(getprocf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - endif(SMPI_F2C) -endif(enable_smpi) + endif() +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt index 9743095d59..4170b1b65a 100644 --- a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt @@ -17,7 +17,7 @@ if(enable_smpi) set_target_properties(ptest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(colluses PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") -endif(enable_smpi) +endif() set(tesh_files ${tesh_files} diff --git a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt index 842271a958..01ee3eb649 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt @@ -99,7 +99,7 @@ if(enable_smpi) # add_executable(structf structf.f) add_executable(typebasef typebasef.f) add_executable(sendcplx sendcplx.f) - endif(SMPI_F2C) + endif() target_link_libraries(overtake m simgrid smpi ) target_link_libraries(bsendtest m simgrid smpi ) @@ -192,7 +192,7 @@ if(enable_smpi) target_link_libraries(sendfort m simgrid smpi f2c) # target_link_libraries(structf m simgrid smpi f2c) target_link_libraries(typebasef m simgrid smpi f2c) - endif(SMPI_F2C) + endif() set_target_properties(overtake PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(bsendtest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") @@ -285,8 +285,8 @@ if(enable_smpi) set_target_properties(sendfort PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") # set_target_properties(structf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(typebasef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - endif(SMPI_F2C) -endif(enable_smpi) + endif() +endif() set(tesh_files ${tesh_files}