From 550e68e2d3bb08b56b4c900ba701e07f38882b19 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Mon, 5 Jan 2015 18:03:53 +0100 Subject: [PATCH] Change include order for smpi tests/examples to avoid conflicts This include folder is the one where our mpi.h file lives. This file is provided by various other libraries. When another simgrid include folder contains another mpi.h file from another library, build is broken This trouble was seen on a freebsd system with graphviz installed, which added an include path in /usr/local/include, where there was a mpi.h file from mpich This commit forces the one from smpi to be the first and only mpi.h file examples/tests do use --- examples/smpi/CMakeLists.txt | 2 +- examples/smpi/MM/CMakeLists.txt | 2 +- examples/smpi/energy/CMakeLists.txt | 2 +- examples/smpi/replay_multiple/CMakeLists.txt | 2 +- examples/smpi/smpi_msg_masterslave/CMakeLists.txt | 2 +- teshsuite/bug-17132/CMakeLists.txt | 2 +- teshsuite/smpi/allgather/CMakeLists.txt | 2 +- teshsuite/smpi/allgatherv/CMakeLists.txt | 2 +- teshsuite/smpi/allreduce/CMakeLists.txt | 2 +- teshsuite/smpi/alltoall/CMakeLists.txt | 2 +- teshsuite/smpi/alltoallv/CMakeLists.txt | 2 +- teshsuite/smpi/barrier/CMakeLists.txt | 2 +- teshsuite/smpi/bcast/CMakeLists.txt | 2 +- teshsuite/smpi/compute/CMakeLists.txt | 2 +- teshsuite/smpi/gather/CMakeLists.txt | 2 +- teshsuite/smpi/hvector/CMakeLists.txt | 2 +- teshsuite/smpi/indexed/CMakeLists.txt | 2 +- teshsuite/smpi/isp/umpire/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/attr/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/coll/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/comm/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/group/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/info/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/init/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/perf/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/rma/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/topo/CMakeLists.txt | 2 +- teshsuite/smpi/pingpong/CMakeLists.txt | 2 +- teshsuite/smpi/reduce/CMakeLists.txt | 2 +- teshsuite/smpi/scatter/CMakeLists.txt | 2 +- teshsuite/smpi/shared/CMakeLists.txt | 2 +- teshsuite/smpi/struct/CMakeLists.txt | 2 +- teshsuite/smpi/vector/CMakeLists.txt | 2 +- 53 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index c067e74d61..8effff1913 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mc/") diff --git a/examples/smpi/MM/CMakeLists.txt b/examples/smpi/MM/CMakeLists.txt index 366f39c754..bac394d3b6 100644 --- a/examples/smpi/MM/CMakeLists.txt +++ b/examples/smpi/MM/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") if(NOT WIN32) add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c) diff --git a/examples/smpi/energy/CMakeLists.txt b/examples/smpi/energy/CMakeLists.txt index d4372a9876..c6efd6e00d 100644 --- a/examples/smpi/energy/CMakeLists.txt +++ b/examples/smpi/energy/CMakeLists.txt @@ -8,7 +8,7 @@ if(enable_smpi) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(se se.c) target_link_libraries(se simgrid) diff --git a/examples/smpi/replay_multiple/CMakeLists.txt b/examples/smpi/replay_multiple/CMakeLists.txt index 493df3d6a8..2f9afa5dcd 100644 --- a/examples/smpi/replay_multiple/CMakeLists.txt +++ b/examples/smpi/replay_multiple/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(replay_multiple replay_multiple.c) target_link_libraries(replay_multiple simgrid) diff --git a/examples/smpi/smpi_msg_masterslave/CMakeLists.txt b/examples/smpi/smpi_msg_masterslave/CMakeLists.txt index 5d03cf60a9..0c42986f03 100644 --- a/examples/smpi/smpi_msg_masterslave/CMakeLists.txt +++ b/examples/smpi/smpi_msg_masterslave/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(masterslave_mailbox_smpi masterslave_mailbox_smpi.c) target_link_libraries(masterslave_mailbox_smpi simgrid) diff --git a/teshsuite/bug-17132/CMakeLists.txt b/teshsuite/bug-17132/CMakeLists.txt index 8cc6e77b54..aeaae90d8d 100644 --- a/teshsuite/bug-17132/CMakeLists.txt +++ b/teshsuite/bug-17132/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(bug-17132 ${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132/bug-17132.c) target_link_libraries(bug-17132 simgrid) diff --git a/teshsuite/smpi/allgather/CMakeLists.txt b/teshsuite/smpi/allgather/CMakeLists.txt index ecdaa81fc3..6ed0ecbd05 100644 --- a/teshsuite/smpi/allgather/CMakeLists.txt +++ b/teshsuite/smpi/allgather/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(allgather_coll allgather_coll.c) target_link_libraries(allgather_coll simgrid) endif() diff --git a/teshsuite/smpi/allgatherv/CMakeLists.txt b/teshsuite/smpi/allgatherv/CMakeLists.txt index 8e1693c5fa..75445206fa 100644 --- a/teshsuite/smpi/allgatherv/CMakeLists.txt +++ b/teshsuite/smpi/allgatherv/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(allgatherv_coll allgatherv_coll.c) target_link_libraries(allgatherv_coll simgrid) endif() diff --git a/teshsuite/smpi/allreduce/CMakeLists.txt b/teshsuite/smpi/allreduce/CMakeLists.txt index a4ad62cb9a..69511aab2d 100644 --- a/teshsuite/smpi/allreduce/CMakeLists.txt +++ b/teshsuite/smpi/allreduce/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(allreduce allreduce.c) add_executable(allreduce_coll allreduce_coll.c) target_link_libraries(allreduce simgrid) diff --git a/teshsuite/smpi/alltoall/CMakeLists.txt b/teshsuite/smpi/alltoall/CMakeLists.txt index 371e7d6964..c4ad5461ac 100644 --- a/teshsuite/smpi/alltoall/CMakeLists.txt +++ b/teshsuite/smpi/alltoall/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(alltoall2 alltoall2.c) add_executable(alltoall_basic alltoall_basic.c) add_executable(alltoall_coll alltoall_coll.c) diff --git a/teshsuite/smpi/alltoallv/CMakeLists.txt b/teshsuite/smpi/alltoallv/CMakeLists.txt index 00ba90cb9a..5c96bad442 100644 --- a/teshsuite/smpi/alltoallv/CMakeLists.txt +++ b/teshsuite/smpi/alltoallv/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(alltoallv_coll alltoallv_coll.c) target_link_libraries(alltoallv_coll simgrid) endif() diff --git a/teshsuite/smpi/barrier/CMakeLists.txt b/teshsuite/smpi/barrier/CMakeLists.txt index 2d7d550cca..72fd58fff3 100644 --- a/teshsuite/smpi/barrier/CMakeLists.txt +++ b/teshsuite/smpi/barrier/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(barrier_coll barrier.c ) target_link_libraries(barrier_coll simgrid) endif() diff --git a/teshsuite/smpi/bcast/CMakeLists.txt b/teshsuite/smpi/bcast/CMakeLists.txt index 0ad7183b57..27643587d9 100644 --- a/teshsuite/smpi/bcast/CMakeLists.txt +++ b/teshsuite/smpi/bcast/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(bcast bcast.c) add_executable(bcast_coll bcast_coll.c) target_link_libraries(bcast simgrid) diff --git a/teshsuite/smpi/compute/CMakeLists.txt b/teshsuite/smpi/compute/CMakeLists.txt index 1f259147b5..45bd3fa9dd 100644 --- a/teshsuite/smpi/compute/CMakeLists.txt +++ b/teshsuite/smpi/compute/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(compute compute.c) add_executable(compute2 compute2.c) add_executable(compute3 compute3.c) diff --git a/teshsuite/smpi/gather/CMakeLists.txt b/teshsuite/smpi/gather/CMakeLists.txt index 386a6641fe..3bfd8dab01 100644 --- a/teshsuite/smpi/gather/CMakeLists.txt +++ b/teshsuite/smpi/gather/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(gather_coll gather_coll.c) target_link_libraries(gather_coll simgrid) endif() diff --git a/teshsuite/smpi/hvector/CMakeLists.txt b/teshsuite/smpi/hvector/CMakeLists.txt index fe240c2d74..99fddbfede 100644 --- a/teshsuite/smpi/hvector/CMakeLists.txt +++ b/teshsuite/smpi/hvector/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(hvector_test hvector_test.c) target_link_libraries(hvector_test simgrid) endif() diff --git a/teshsuite/smpi/indexed/CMakeLists.txt b/teshsuite/smpi/indexed/CMakeLists.txt index e6c9af4e82..927e849d90 100644 --- a/teshsuite/smpi/indexed/CMakeLists.txt +++ b/teshsuite/smpi/indexed/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(indexed_test indexed_test.c) target_link_libraries(indexed_test simgrid) endif() diff --git a/teshsuite/smpi/isp/umpire/CMakeLists.txt b/teshsuite/smpi/isp/umpire/CMakeLists.txt index 254020f2af..ac4e2da883 100644 --- a/teshsuite/smpi/isp/umpire/CMakeLists.txt +++ b/teshsuite/smpi/isp/umpire/CMakeLists.txt @@ -201,7 +201,7 @@ if(enable_smpi AND enable_smpi_ISP_testsuite) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") FOREACH (s ${umpire_src}) STRING(REGEX REPLACE "\\.c$" "" exe ${s}) diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt index 3d71bdf407..ff018b3e25 100644 --- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(attr2type attr2type.c) diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt index 97cb9cd2db..8f1fde7919 100644 --- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(allgather2 allgather2.c) diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt index ab5663beaa..779209f9e5 100644 --- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(cmfree cmfree.c) diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt index 10f915e5c0..7568eecec9 100644 --- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") # add_executable(blockindexed-misc blockindexed-misc.c) diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt index 55916b7646..9e4767b6e1 100644 --- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../include/") add_executable(attrmpi1f attrmpi1f.f) diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt index 0ae2a3fadd..2db2d5e015 100644 --- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") # add_executable(allredint8f allredint8f.f) diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt index 3560877ccf..b3017ef19e 100644 --- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") # add_executable(commerrf commerrf.f) diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt index fc6366cf1a..79dc501ad2 100644 --- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h @ONLY) diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt index 2d0c9204ec..161fc3165e 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") # add_executable(allocmemf allocmemf.f) diff --git a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt index a7aa476388..c0912b37bd 100644 --- a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt index 7cee626164..af11de1b3b 100644 --- a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(baseenvf baseenvf.f) diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt index 90782d45e3..c75bfc8941 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(allpairf allpairf.f) diff --git a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt index 406428576d..d1e702cecc 100644 --- a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(winaccf winaccf.f) diff --git a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt index 50f2d08524..2e39977efd 100644 --- a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(cartcrf cartcrf.f) diff --git a/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt index b56403b14f..ab18767254 100644 --- a/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") #F77 version of the mtest library diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt index c48dd83e41..95a7b5e451 100644 --- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") # add_executable(allredint8f90 allredint8f90.f90) # add_executable(allredopttf90 allredopttf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt index d5c02d2b39..a400a1c01c 100644 --- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") # add_executable(allctypesf90 allctypesf90.f90) # add_executable(createf90 createf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt index a1a319c191..b538ccc200 100644 --- a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(infotest2f90 infotest2f90.f90 ../util/mtestf90.f90) add_executable(infotestf90 infotestf90.f90 ../util/mtestf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt index 254e6b1708..0f0449fe72 100644 --- a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(baseenvf90 baseenvf90.f90) target_link_libraries(baseenvf90 simgrid mtest_f90) diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt index 89e3b7db91..564a213d59 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(allpairf90 allpairf90.f90) # add_executable(greqf90 greqf90.f90 dummyf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt index 9e1c984cb8..dc43b4887f 100644 --- a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(winaccf90 winaccf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt index 224b03193b..d7295b209e 100644 --- a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") #F90 version of the mtest library add_library(mtest_f90 STATIC ../util/mtestf90.f90) diff --git a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt index 41ea6ff190..313a147beb 100644 --- a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(groupcreate groupcreate.c) diff --git a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt index 350e83f0a3..8fb163226c 100644 --- a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt index 7b035fb906..4e8cf0be5c 100644 --- a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") # add_executable(attrself attrself.c) diff --git a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt index 2190d6e8f3..8c810c207a 100644 --- a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt index ab00e09abc..cd94670925 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") add_executable(anyall anyall.c) diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index c5b39ec8e5..5bdeacf497 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) 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") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt index f2f36dded0..1170fa0212 100644 --- a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/pingpong/CMakeLists.txt b/teshsuite/smpi/pingpong/CMakeLists.txt index f1f3c9a6c0..642cf716eb 100644 --- a/teshsuite/smpi/pingpong/CMakeLists.txt +++ b/teshsuite/smpi/pingpong/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(pingpong pingpong.c) add_executable(dsend dsend.c) target_link_libraries(pingpong simgrid) diff --git a/teshsuite/smpi/reduce/CMakeLists.txt b/teshsuite/smpi/reduce/CMakeLists.txt index 8e36392306..4b9bc6c4fc 100644 --- a/teshsuite/smpi/reduce/CMakeLists.txt +++ b/teshsuite/smpi/reduce/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(reduce reduce.c) add_executable(reduce_coll reduce_coll.c) add_executable(reduce_scatter_coll reduce_scatter_coll.c) diff --git a/teshsuite/smpi/scatter/CMakeLists.txt b/teshsuite/smpi/scatter/CMakeLists.txt index ca5efd0c64..0df80e4203 100644 --- a/teshsuite/smpi/scatter/CMakeLists.txt +++ b/teshsuite/smpi/scatter/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(scatter scatter.c) target_link_libraries(scatter simgrid) endif() diff --git a/teshsuite/smpi/shared/CMakeLists.txt b/teshsuite/smpi/shared/CMakeLists.txt index 0e44008dbc..8ad5a316be 100644 --- a/teshsuite/smpi/shared/CMakeLists.txt +++ b/teshsuite/smpi/shared/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") if(NOT WIN32) add_executable(shared shared.c) target_link_libraries(shared simgrid) diff --git a/teshsuite/smpi/struct/CMakeLists.txt b/teshsuite/smpi/struct/CMakeLists.txt index b8b2a830aa..5a48e12468 100644 --- a/teshsuite/smpi/struct/CMakeLists.txt +++ b/teshsuite/smpi/struct/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(struct_test struct_test.c) target_link_libraries(struct_test simgrid) endif() diff --git a/teshsuite/smpi/vector/CMakeLists.txt b/teshsuite/smpi/vector/CMakeLists.txt index 0eb0ee2b25..388a732854 100644 --- a/teshsuite/smpi/vector/CMakeLists.txt +++ b/teshsuite/smpi/vector/CMakeLists.txt @@ -9,7 +9,7 @@ if(enable_smpi) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(vector_test vector_test.c) target_link_libraries(vector_test simgrid) endif() -- 2.20.1