Change include order for smpi tests/examples to avoid conflicts

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

diff --git a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
index 3e4ec84..0f0449f 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
+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,10 +9,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
   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 ../util/mtestf90.f90)
-  target_link_libraries(baseenvf90  simgrid)
+  add_executable(baseenvf90 baseenvf90.f90)
+  target_link_libraries(baseenvf90 simgrid mtest_f90)
 
 endif()