Change include order for smpi tests/examples to avoid conflicts

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

diff --git a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt
index ac51f8a..4e8cf0b 100644 (file)
--- a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-if(enable_smpi)
+if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
   else()
@@ -9,44 +9,28 @@ 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")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-  include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
+#  add_executable(attrself attrself.c)
+  add_executable(exitst1 exitst1.c)
+  add_executable(exitst2 exitst2.c)
+#  add_executable(exitst3 exitst3.c)
+  add_executable(finalized finalized.c)
+  add_executable(initstat initstat.c)
+  add_executable(library_version library_version.c)
+#  add_executable(timeout timeout.c)
+  add_executable(version version.c)
 
-  add_executable(attrself attrself.c ../util/mtest.c)
-  add_executable(exitst1 exitst1.c ../util/mtest.c)
-  add_executable(exitst2 exitst2.c ../util/mtest.c)
-  add_executable(exitst3 exitst3.c ../util/mtest.c)
-  add_executable(finalized finalized.c ../util/mtest.c)
-  add_executable(initstat initstat.c ../util/mtest.c)
-  add_executable(library_version library_version.c ../util/mtest.c)
-  add_executable(timeout timeout.c ../util/mtest.c)
-  add_executable(version version.c ../util/mtest.c)
-
-
-
-  target_link_libraries(attrself  simgrid)
-  target_link_libraries(exitst1  simgrid)
-  target_link_libraries(exitst2  simgrid)
-  target_link_libraries(exitst3  simgrid)
-  target_link_libraries(finalized  simgrid)
-  target_link_libraries(initstat  simgrid)
-  target_link_libraries(library_version  simgrid)
-  target_link_libraries(timeout  simgrid)
-  target_link_libraries(version  simgrid)
-
-
-
- set_target_properties(attrself PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exitst1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exitst2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exitst3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(finalized PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(initstat PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(library_version PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(timeout PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(version PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+#  target_link_libraries(attrself simgrid mtest_c)
+  target_link_libraries(exitst1 simgrid mtest_c)
+  target_link_libraries(exitst2 simgrid mtest_c)
+#  target_link_libraries(exitst3 simgrid mtest_c)
+  target_link_libraries(finalized simgrid mtest_c)
+  target_link_libraries(initstat simgrid mtest_c)
+  target_link_libraries(library_version simgrid mtest_c)
+#  target_link_libraries(timeout simgrid mtest_c)
+  target_link_libraries(version simgrid mtest_c)
 
 endif()
 
@@ -77,7 +61,6 @@ set(bin_files
   )
 set(txt_files
   ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/runtests
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   PARENT_SCOPE
   )