Change include order for smpi tests/examples to avoid conflicts

[simgrid.git] / teshsuite / smpi / mpich3-test / group / CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt
index e67ccca..313a147 100644 (file)
--- a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt
@@ -9,22 +9,22 @@ 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 ../util/mtest.c)
-  add_executable(groupnullincl groupnullincl.c ../util/mtest.c)
-  add_executable(grouptest2 grouptest2.c ../util/mtest.c)
-  add_executable(grouptest grouptest.c ../util/mtest.c)
-  add_executable(gtranks gtranks.c ../util/mtest.c)
-  add_executable(gtranksperf gtranksperf.c ../util/mtest.c)
+  add_executable(groupcreate groupcreate.c)
+#  add_executable(groupnullincl groupnullincl.c)
+  add_executable(grouptest2 grouptest2.c)
+  add_executable(grouptest grouptest.c)
+  add_executable(gtranks gtranks.c)
+  add_executable(gtranksperf gtranksperf.c)
 
-  target_link_libraries(groupcreate  simgrid)
-  target_link_libraries(groupnullincl  simgrid)
-  target_link_libraries(grouptest2  simgrid)
-  target_link_libraries(grouptest  simgrid)
-  target_link_libraries(gtranks  simgrid)
-  target_link_libraries(gtranksperf  simgrid)
+  target_link_libraries(groupcreate simgrid mtest_c)
+#  target_link_libraries(groupnullincl simgrid mtest_c)
+  target_link_libraries(grouptest2 simgrid mtest_c)
+  target_link_libraries(grouptest simgrid mtest_c)
+  target_link_libraries(gtranks simgrid mtest_c)
+  target_link_libraries(gtranksperf simgrid mtest_c)
 
 endif()