Change include order for smpi tests/examples to avoid conflicts

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

diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
index 80bbfe2..b3017ef 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-if(enable_smpi AND SMPI_F2C)
+if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
   else()
@@ -9,14 +9,14 @@ if(enable_smpi AND SMPI_F2C)
   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 ../util/mtestf.f)
-  add_executable(commnamef commnamef.f ../util/mtestf.f)
+ # add_executable(commerrf commerrf.f)
+#  add_executable(commnamef commnamef.f)
 
- # target_link_libraries(commerrf  simgrid)
-  target_link_libraries(commnamef  simgrid)
+ # target_link_libraries(commerrf simgrid mtest_f77)
+#  target_link_libraries(commnamef simgrid mtest_f77)
 
 endif()