Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
index 90e04da..a25fef7 100644 (file)
--- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
@@ -10,44 +8,44 @@ 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 ../util/mtest.c)
-  add_executable(attrend2 attrend2.c ../util/mtest.c)
-  add_executable(attrend attrend.c ../util/mtest.c)
-  add_executable(attrerr attrerr.c ../util/mtest.c)
-  add_executable(attrerrcomm attrerrcomm.c ../util/mtest.c)
-  add_executable(attrerrtype attrerrtype.c ../util/mtest.c)
-  add_executable(attric attric.c ../util/mtest.c)
-  add_executable(attrorder attrorder.c ../util/mtest.c)
-  add_executable(attrordercomm attrordercomm.c ../util/mtest.c)
-  add_executable(attrordertype attrordertype.c ../util/mtest.c)
-  add_executable(attrt attrt.c ../util/mtest.c)
-  add_executable(baseattr2 baseattr2.c ../util/mtest.c)
-  add_executable(baseattrcomm baseattrcomm.c ../util/mtest.c)
-  add_executable(fkeyval fkeyval.c ../util/mtest.c)
-  add_executable(fkeyvalcomm fkeyvalcomm.c ../util/mtest.c)
-  add_executable(fkeyvaltype fkeyvaltype.c ../util/mtest.c)
-  add_executable(keyval_double_free keyval_double_free.c ../util/mtest.c)
+  add_executable(attr2type attr2type.c)
+  add_executable(attrend2 attrend2.c)
+  add_executable(attrend attrend.c)
+  add_executable(attrerr attrerr.c)
+  add_executable(attrerrcomm attrerrcomm.c)
+  add_executable(attrerrtype attrerrtype.c)
+#  add_executable(attric attric.c)
+  add_executable(attrorder attrorder.c)
+  add_executable(attrordercomm attrordercomm.c)
+  add_executable(attrordertype attrordertype.c)
+  add_executable(attrt attrt.c)
+  add_executable(baseattr2 baseattr2.c)
+  add_executable(baseattrcomm baseattrcomm.c)
+  add_executable(fkeyval fkeyval.c)
+#  add_executable(fkeyvalcomm fkeyvalcomm.c)
+#  add_executable(fkeyvaltype fkeyvaltype.c)
+#  add_executable(keyval_double_free keyval_double_free.c)
 
-  target_link_libraries(attr2type  simgrid)
-  target_link_libraries(attrend2 simgrid)
-  target_link_libraries(attrend simgrid)
-  target_link_libraries(attrerr simgrid)
-  target_link_libraries(attrerrcomm simgrid)
-  target_link_libraries(attrerrtype simgrid)
-  target_link_libraries(attric simgrid)
-  target_link_libraries(attrorder simgrid)
-  target_link_libraries(attrordercomm simgrid)
-  target_link_libraries(attrordertype simgrid)
-  target_link_libraries(attrt simgrid)
-  target_link_libraries(baseattr2 simgrid)
-  target_link_libraries(baseattrcomm simgrid)
-  target_link_libraries(fkeyval simgrid)
-  target_link_libraries(fkeyvalcomm simgrid)
-  target_link_libraries(fkeyvaltype simgrid)
-  target_link_libraries(keyval_double_free simgrid)
+  target_link_libraries(attr2type simgrid mtest_c)
+  target_link_libraries(attrend2 simgrid mtest_c)
+  target_link_libraries(attrend simgrid mtest_c)
+  target_link_libraries(attrerr simgrid mtest_c)
+  target_link_libraries(attrerrcomm simgrid mtest_c)
+  target_link_libraries(attrerrtype simgrid mtest_c)
+#  target_link_libraries(attric simgrid mtest_c)
+  target_link_libraries(attrorder simgrid mtest_c)
+  target_link_libraries(attrordercomm simgrid mtest_c)
+  target_link_libraries(attrordertype simgrid mtest_c)
+  target_link_libraries(attrt simgrid mtest_c)
+  target_link_libraries(baseattr2 simgrid mtest_c)
+  target_link_libraries(baseattrcomm simgrid mtest_c)
+  target_link_libraries(fkeyval simgrid mtest_c)
+#  target_link_libraries(fkeyvalcomm simgrid mtest_c)
+#  target_link_libraries(fkeyvaltype simgrid mtest_c)
+#  target_link_libraries(keyval_double_free simgrid mtest_c)
 
 endif()