X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9d0310b37e3c0e23fc7b71ba76ff1fe2d640e36..8340b9ca34a27bc19136607105d3ec1fe15c91db:/teshsuite/smpi/mpich-test/coll/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt
index 357fc78c59..7137203026 100644
--- a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt
@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
 if(enable_smpi)
-  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/bin/smpicc")
-  set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/bin/smpiff")
-  set(CMAKE_Fortran_LINKER "${CMAKE_BINARY_DIR}/bin/smpicc")
+  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
+  set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
   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")
 
@@ -40,11 +39,11 @@ if(enable_smpi)
   add_executable(longuser longuser.c test.c)
 
   if(SMPI_F2C)
-  add_executable(allredf allredf.f)
-  add_executable(assocf assocf.f)
-  add_executable(allgatherf allgatherf.f)
-  add_executable(bcastlog bcastlog.f)
-  endif(SMPI_F2C)
+    add_executable(allredf allredf.f)
+    add_executable(assocf assocf.f)
+    add_executable(allgatherf allgatherf.f)
+    add_executable(bcastlog bcastlog.f)
+  endif()
 
   target_link_libraries(coll1  m simgrid smpi )
   target_link_libraries(coll2 m simgrid smpi )
@@ -76,11 +75,11 @@ if(enable_smpi)
   target_link_libraries(alltoallv_mpich m simgrid smpi )
   target_link_libraries(scantst m simgrid smpi )
   if(SMPI_F2C)
-  target_link_libraries(allredf m simgrid smpi )
-  target_link_libraries(assocf m simgrid smpi )
-  target_link_libraries(allgatherf m simgrid smpi )
-  target_link_libraries(bcastlog m simgrid smpi )
-  endif(SMPI_F2C)
+    target_link_libraries(allredf m simgrid smpi )
+    target_link_libraries(assocf m simgrid smpi )
+    target_link_libraries(allgatherf m simgrid smpi )
+    target_link_libraries(bcastlog m simgrid smpi )
+  endif()
 
   set_target_properties(coll1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   set_target_properties(coll2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -112,17 +111,16 @@ if(enable_smpi)
   set_target_properties(alltoallv_mpich PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   set_target_properties(scantst PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   if(SMPI_F2C)
-  set_target_properties(allredf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(assocf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(allgatherf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(bcastlog PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  endif(SMPI_F2C)
+    set_target_properties(allredf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+    set_target_properties(assocf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+    set_target_properties(allgatherf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+    set_target_properties(bcastlog PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  endif()
 
-endif(enable_smpi)
+endif()
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/coll.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -131,7 +129,7 @@ set(xml_files
   )
 set(examples_src
   ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/coll1 .c
+  ${CMAKE_CURRENT_SOURCE_DIR}/coll1.c
   ${CMAKE_CURRENT_SOURCE_DIR}/coll2.c
   ${CMAKE_CURRENT_SOURCE_DIR}/coll3.c
   ${CMAKE_CURRENT_SOURCE_DIR}/coll4.c
@@ -142,7 +140,7 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/coll9.c
   ${CMAKE_CURRENT_SOURCE_DIR}/coll10.c
   ${CMAKE_CURRENT_SOURCE_DIR}/coll11.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/coll12 .c
+  ${CMAKE_CURRENT_SOURCE_DIR}/coll12.c
   ${CMAKE_CURRENT_SOURCE_DIR}/coll13.c
   ${CMAKE_CURRENT_SOURCE_DIR}/allredmany.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bcastbug.c
@@ -172,7 +170,6 @@ set(examples_src
   )
 set(bin_files
   ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../hostfile
   PARENT_SCOPE
   )
 set(txt_files