A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #272 from mpoquet/SMPI_convert
[simgrid.git]
/
teshsuite
/
smpi
/
mpich3-test
/
f90
/
util
/
CMakeLists.txt
diff --git
a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
index 04968a4e4602af69af6ba64e1d7921396dee9bb7..6f38ae4c5c90a00a017215386c4fcc9dc95dc2cf 100644
(file)
--- a/
teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
+++ b/
teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
@@
-1,6
+1,4
@@
-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()
if(WIN32)
set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
else()
@@
-8,17
+6,15
@@
if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90")
endif()
set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90")
endif()
- set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
- include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+ include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
#F90 version of the mtest library
add_library(mtest_f90 STATIC ../util/mtestf90.f90)
#F90 version of the mtest library
add_library(mtest_f90 STATIC ../util/mtestf90.f90)
-
+ #fake dependency, to ensure mpi.mod is generated properly before
+ target_link_libraries(mtest_f90 mpi)
endif()
endif()
-
set(txt_files
${txt_files}
${CMAKE_CURRENT_SOURCE_DIR}/../util/mtestf90.f90
set(txt_files
${txt_files}
${CMAKE_CURRENT_SOURCE_DIR}/../util/mtestf90.f90
- PARENT_SCOPE
- )
+ PARENT_SCOPE)