From: Augustin Degomme Date: Tue, 16 Jul 2013 17:02:46 +0000 (+0200) Subject: cmakelists cleanup X-Git-Tag: v3_9_90~130^2~4 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/273106067a95b0e3dc65904ff59c87e22522d1aa cmakelists cleanup --- diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt index 4ac5709bca..d149b334dd 100644 --- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt @@ -34,15 +34,15 @@ if(enable_smpi) target_link_libraries(typeattrf simgrid) - set_target_properties(attrmpi1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(baseattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(baseattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(commattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(commattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(commattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typeattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typeattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typeattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(attrmpi1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(baseattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(baseattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(commattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(commattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(commattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typeattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typeattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typeattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") endif() diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt index 4b1c593519..6703e938ea 100644 --- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt @@ -9,11 +9,10 @@ if(enable_smpi) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1 -Wno-error=unused-variable -Wno-implicit -g") + set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1 -Wno-error=unused-variable -Wno-implicit") include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/") - add_executable(allredint8f allredint8f.f ../util/mtestf.f) add_executable(allredopttf allredopttf.f ../util/mtestf.f) add_executable(alltoallvf alltoallvf.f ../util/mtestf.f) @@ -29,8 +28,6 @@ if(enable_smpi) add_executable(uallreducef uallreducef.f ../util/mtestf.f) add_executable(vw_inplacef vw_inplacef.f ../util/mtestf.f) - - target_link_libraries(allredint8f simgrid) target_link_libraries(allredopttf simgrid) target_link_libraries(alltoallvf simgrid) @@ -46,22 +43,20 @@ if(enable_smpi) target_link_libraries(uallreducef simgrid) target_link_libraries(vw_inplacef simgrid) - - - set_target_properties(allredint8f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(allredopttf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(alltoallvf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(alltoallwf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(exscanf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(inplacef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") -# set_target_properties(nonblockingf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") -# set_target_properties(nonblocking_inpf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(red_scat_blockf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(redscatf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(reducelocalf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(split_typef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(uallreducef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(vw_inplacef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(allredint8f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(allredopttf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(alltoallvf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(alltoallwf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(exscanf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(inplacef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") +# set_target_properties(nonblockingf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") +# set_target_properties(nonblocking_inpf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(red_scat_blockf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(redscatf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(reducelocalf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(split_typef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(uallreducef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(vw_inplacef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") endif() @@ -97,7 +92,6 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/runtests ${CMAKE_CURRENT_SOURCE_DIR}/testlist PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt index 8dc5f07b1f..2b8963e939 100644 --- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -17,15 +17,11 @@ if(enable_smpi) # add_executable(commerrf commerrf.f ../util/mtestf.f) add_executable(commnamef commnamef.f ../util/mtestf.f) - - # target_link_libraries(commerrf simgrid) target_link_libraries(commnamef simgrid) - - # set_target_properties(commerrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(commnamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(commnamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") endif() @@ -49,7 +45,6 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/runtests ${CMAKE_CURRENT_SOURCE_DIR}/testlist PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt index 380584f0dc..7a1d9ed938 100644 --- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt @@ -13,7 +13,6 @@ if(enable_smpi) include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/") - add_executable(allctypesf allctypesf.f ../util/mtestf.f) add_executable(gaddressf gaddressf.f ../util/mtestf.f) add_executable(hindex1f hindex1f.f ../util/mtestf.f) @@ -27,8 +26,6 @@ if(enable_smpi) add_executable(typesnamef typesnamef.f ../util/mtestf.f) add_executable(typesubf typesubf.f ../util/mtestf.f) - - target_link_libraries(allctypesf simgrid) target_link_libraries(gaddressf simgrid) target_link_libraries(hindex1f simgrid) @@ -42,20 +39,18 @@ if(enable_smpi) target_link_libraries(typesnamef simgrid) target_link_libraries(typesubf simgrid) - - - set_target_properties(allctypesf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(gaddressf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(hindex1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(hindexed_blockf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(packef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typeaints PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typecntsf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typem2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typename3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typenamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typesnamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(typesubf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(allctypesf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(gaddressf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(hindex1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(hindexed_blockf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(packef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typeaints PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typecntsf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typem2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typename3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typenamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typesnamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(typesubf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") endif() @@ -89,7 +84,7 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/runtests ${CMAKE_CURRENT_SOURCE_DIR}/testlist + ${CMAKE_CURRENT_SOURCE_DIR}/../util/mtestf.f PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt index c14e134968..86d7fd9add 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt @@ -19,15 +19,11 @@ if(enable_smpi) # add_executable(c2f2cf c2f2cf.f c2f2c.c ../util/mtestf.f) # add_executable(ctypesinf ctypesinf.f ctypesfromc.c ../util/mtestf.f) - - target_link_libraries(add1size simgrid) # target_link_libraries(allocmemf simgrid) # target_link_libraries(c2f2cf simgrid) # target_link_libraries(ctypesinf simgrid) - - set_target_properties(add1size PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") # set_target_properties(allocmemf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") # set_target_properties(c2f2cf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") @@ -59,7 +55,6 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/runtests ${CMAKE_CURRENT_SOURCE_DIR}/testlist PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt index 2a756bc8ae..1881d6cb83 100644 --- a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt @@ -13,16 +13,9 @@ if(enable_smpi) include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/") - add_executable(baseenvf baseenvf.f ../util/mtestf.f) - - - target_link_libraries(baseenvf simgrid) - - - - set_target_properties(baseenvf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + set_target_properties(baseenvf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") endif() @@ -45,7 +38,6 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/runtests ${CMAKE_CURRENT_SOURCE_DIR}/testlist PARENT_SCOPE ) diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt index 3af650ced0..9ac49c7b90 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1 -Wno-error=unused-variable -Wno-implicit -g") + set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1 -Wno-error=unused-variable -Wno-implicit") include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/") @@ -55,7 +55,6 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/runtests ${CMAKE_CURRENT_SOURCE_DIR}/testlist PARENT_SCOPE )