X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cef9c4a5d0ba0ea7298147feae9b1164a289f6b7..1fcf48fc76832f12e7e1b8d63e7809e401b39f89:/teshsuite/smpi/mpich-test/env/CMakeLists.txt?ds=sidebyside

diff --git a/teshsuite/smpi/mpich-test/env/CMakeLists.txt b/teshsuite/smpi/mpich-test/env/CMakeLists.txt
index b671596b17..f347298782 100644
--- a/teshsuite/smpi/mpich-test/env/CMakeLists.txt
+++ b/teshsuite/smpi/mpich-test/env/CMakeLists.txt
@@ -3,8 +3,6 @@ cmake_minimum_required(VERSION 2.6)
 if(enable_smpi)
   set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
   set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
-  set(CMAKE_Fortran_LINKER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
-
   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")
 
@@ -21,11 +19,11 @@ if(enable_smpi)
   add_executable(testerr testerr.c)
   add_executable(getproc getproc.c)
   if(SMPI_F2C)
-#  add_executable(baseattrf baseattrf.f)
-#  add_executable(errhandf errhandf.f)
-#  add_executable(errstringsf errstringsf.f)
-  add_executable(getprocf getprocf.f)
-  endif(SMPI_F2C)
+#    add_executable(baseattrf baseattrf.f)
+#    add_executable(errhandf errhandf.f)
+#    add_executable(errstringsf errstringsf.f)
+    add_executable(getprocf getprocf.f)
+  endif()
   target_link_libraries(init m simgrid smpi )
   target_link_libraries(timers m simgrid smpi )
   target_link_libraries(timertest m simgrid smpi )
@@ -37,11 +35,11 @@ if(enable_smpi)
   target_link_libraries(testerr m simgrid smpi )
   target_link_libraries(getproc m simgrid smpi )
   if(SMPI_F2C)
-#  target_link_libraries(baseattrf m simgrid smpi )
-#  target_link_libraries(errhandf m simgrid smpi )
-#  target_link_libraries(errstringsf m simgrid smpi )
-  target_link_libraries(getprocf m simgrid smpi )
-  endif(SMPI_F2C)
+#    target_link_libraries(baseattrf m simgrid smpi )
+#    target_link_libraries(errhandf m simgrid smpi )
+#    target_link_libraries(errstringsf m simgrid smpi )
+    target_link_libraries(getprocf m simgrid smpi )
+  endif()
 
   set_target_properties(timers PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   set_target_properties(timers PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -54,16 +52,15 @@ if(enable_smpi)
   set_target_properties(testerr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   set_target_properties(getproc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   if(SMPI_F2C)
-#  set_target_properties(baseattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(errhandf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(errstringsf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(getprocf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  endif(SMPI_F2C)
-endif(enable_smpi)
+#    set_target_properties(baseattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+#    set_target_properties(errhandf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+#    set_target_properties(errstringsf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+    set_target_properties(getprocf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  endif()
+endif()
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/env.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -75,6 +72,7 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/init.c
   ${CMAKE_CURRENT_SOURCE_DIR}/timers.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/timertest.c
   ${CMAKE_CURRENT_SOURCE_DIR}/baseattr.c
   ${CMAKE_CURRENT_SOURCE_DIR}/gtime.c
   ${CMAKE_CURRENT_SOURCE_DIR}/errhand.c
@@ -83,11 +81,14 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/testerr.c
   ${CMAKE_CURRENT_SOURCE_DIR}/getproc.c
   ${CMAKE_CURRENT_SOURCE_DIR}/test.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/baseattrf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/errhandf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/errstringsf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/getprocf.f
   PARENT_SCOPE
   )
 set(bin_files
   ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../hostfile
   PARENT_SCOPE
   )
 set(txt_files