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
don't tell 165 times that we need CMAKE v2.6
[simgrid.git]
/
teshsuite
/
smpi
/
mpich3-test
/
f77
/
init
/
CMakeLists.txt
diff --git
a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
index
58f7b11
..
0491a17
100644
(file)
--- a/
teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
+++ b/
teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
@@
-1,6
+1,4
@@
-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()
if(WIN32)
set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
else()
@@
-9,13
+7,11
@@
if(enable_smpi AND SMPI_F2C)
endif()
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
endif()
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
- set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1 -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
- include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+ include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
- add_executable(baseenvf baseenvf.f ../util/mtestf.f)
- target_link_libraries(baseenvf simgrid)
- set_target_properties(baseenvf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ add_executable(baseenvf baseenvf.f)
+ target_link_libraries(baseenvf simgrid mtest_f77)
endif()
endif()