X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9deda161a84a426d0ea75ec4bd9b8cdc3a4b28fb..550e68e2d3bb08b56b4c900ba701e07f38882b19:/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
index c14e134968..161fc3165e 100644
--- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-if(enable_smpi)
+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,29 +9,16 @@ if(enable_smpi)
   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")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-  include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
+#  add_executable(allocmemf allocmemf.f)
+#  add_executable(c2f2cf c2f2cf.f c2f2c.c)
+#  add_executable(ctypesinf ctypesinf.f ctypesfromc.c)
 
-  add_executable(add1size add1size.h ../util/mtestf.f)
-#  add_executable(allocmemf allocmemf.f ../util/mtestf.f)
-#  add_executable(c2f2cf c2f2cf.f c2f2c.c ../util/mtestf.f)
-#  add_executable(ctypesinf ctypesinf.f ctypesfromc.c ../util/mtestf.f)
-
-
-
-  target_link_libraries(add1size  simgrid)
-#  target_link_libraries(allocmemf  simgrid)
-#  target_link_libraries(c2f2cf  simgrid)
-#  target_link_libraries(ctypesinf  simgrid)
-
-
-
- set_target_properties(add1size PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(allocmemf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(c2f2cf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(ctypesinf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+#  target_link_libraries(allocmemf simgrid mtest_f77)
+#  target_link_libraries(c2f2cf simgrid mtest_f77)
+#  target_link_libraries(ctypesinf simgrid mtest_f77)
 
 endif()
 
@@ -45,12 +32,13 @@ set(xml_files
   )
 set(examples_src
   ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/add1size.h 
- ${CMAKE_CURRENT_SOURCE_DIR}/allocmemf.f 
- ${CMAKE_CURRENT_SOURCE_DIR}/c2f2cf.f 
- ${CMAKE_CURRENT_SOURCE_DIR}/c2f2c.c
- ${CMAKE_CURRENT_SOURCE_DIR}/ctypesinf.f
- ${CMAKE_CURRENT_SOURCE_DIR}/ctypesfromc.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/add1size.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/allocmemf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/c2f2c.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/c2f2cf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/c2fmult.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ctypesfromc.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ctypesinf.f
   PARENT_SCOPE
   )
 set(bin_files
@@ -59,7 +47,6 @@ set(bin_files
   )
 set(txt_files
   ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/runtests
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   PARENT_SCOPE
   )