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
Also add the mpich3 binaries in the dependencies of make tests
[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
d64be2f
..
cd3e8f3
100644
(file)
--- a/
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
+++ b/
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
@@
-1,6
+1,4
@@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi AND enable_smpi_MPICH3_testsuite 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()
if(WIN32)
set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
else()
@@
-8,33
+6,18
@@
if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
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")
-
- add_executable(baseenvf90 baseenvf90.f90 ../util/mtestf90.f90)
- target_link_libraries(baseenvf90 simgrid)
+ include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
+ add_executable(baseenvf90 EXCLUDE_FROM_ALL baseenvf90.f90)
+ add_dependencies(tests baseenvf90)
+ target_link_libraries(baseenvf90 simgrid mtest_f90)
endif()
endif()
-set(tesh_files
- ${tesh_files}
- PARENT_SCOPE
- )
-set(xml_files
- ${xml_files}
- PARENT_SCOPE
- )
set(examples_src
${examples_src}
${CMAKE_CURRENT_SOURCE_DIR}/baseenvf90.f90
set(examples_src
${examples_src}
${CMAKE_CURRENT_SOURCE_DIR}/baseenvf90.f90
- PARENT_SCOPE
- )
-set(bin_files
- ${bin_files}
- PARENT_SCOPE
- )
+ PARENT_SCOPE)
set(txt_files
${txt_files}
${CMAKE_CURRENT_SOURCE_DIR}/testlist
set(txt_files
${txt_files}
${CMAKE_CURRENT_SOURCE_DIR}/testlist
- PARENT_SCOPE
- )
+ PARENT_SCOPE)