Remove conditions from else() and endif() in cmake file.

[simgrid.git] / teshsuite / smpi / mpich-test / pt2pt / CMakeLists.txt

diff --git a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt
index 2ec4b52..01ee3eb 100644 (file)
--- a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt
@@ -1,9 +1,9 @@
 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(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")
 
@@ -89,17 +89,17 @@ if(enable_smpi)
   add_executable(exittest exittest.c)
   add_executable(selfvsworld selfvsworld.c)
   if(SMPI_F2C)
-#  add_executable(secondf secondf.f)
+  add_executable(secondf secondf.f)
 #  add_executable(allpair2 allpair2.f)
 #  add_executable(allpair allpair.f)
-#  add_executable(isendf isendf.f)
-#  add_executable(pingpong_f pingpong.f)
-#  add_executable(send1 send1.f)
-#  add_executable(sendfort sendfort.f)
+  add_executable(isendf isendf.f)
+  add_executable(pingpong_f pingpong.f)
+  add_executable(send1 send1.f)
+  add_executable(sendfort sendfort.f)
 #  add_executable(structf structf.f)
-#  add_executable(typebasef typebasef.f)
+  add_executable(typebasef typebasef.f)
   add_executable(sendcplx sendcplx.f)
-  endif(SMPI_F2C)
+  endif()
 
   target_link_libraries(overtake m simgrid smpi )
   target_link_libraries(bsendtest m simgrid smpi )
@@ -182,17 +182,17 @@ if(enable_smpi)
   target_link_libraries(exittest m simgrid smpi )
   target_link_libraries(selfvsworld m simgrid smpi )
   if(SMPI_F2C)
-#  target_link_libraries(secondf m simgrid smpi f2c)
+  target_link_libraries(secondf m simgrid smpi f2c)
 #  target_link_libraries(allpair2 m simgrid smpi f2c)
 #  target_link_libraries(allpair m simgrid smpi f2c)
-#  target_link_libraries(isendf m simgrid smpi f2c)
-#  target_link_libraries(pingpong_f m simgrid smpi f2c)
-#  target_link_libraries(send1 m simgrid smpi f2c)
+  target_link_libraries(isendf m simgrid smpi f2c)
+  target_link_libraries(pingpong_f m simgrid smpi f2c)
+  target_link_libraries(send1 m simgrid smpi f2c)
   target_link_libraries(sendcplx m simgrid smpi f2c)
-#  target_link_libraries(sendfort m simgrid smpi f2c)
+  target_link_libraries(sendfort m simgrid smpi f2c)
 #  target_link_libraries(structf m simgrid smpi f2c)
-#  target_link_libraries(typebasef m simgrid smpi f2c)
-  endif(SMPI_F2C)
+  target_link_libraries(typebasef m simgrid smpi f2c)
+  endif()
 
   set_target_properties(overtake PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   set_target_properties(bsendtest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -275,18 +275,18 @@ if(enable_smpi)
   set_target_properties(exittest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   set_target_properties(selfvsworld PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   if(SMPI_F2C)
-#  set_target_properties(secondf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}" )
+  set_target_properties(secondf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}" )
 #  set_target_properties(allpair2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}"  )
 #  set_target_properties(allpair PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}" )
-#  set_target_properties(isendf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}" )
-#  set_target_properties(pingpong_f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(send1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  set_target_properties(isendf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}" )
+  set_target_properties(pingpong_f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  set_target_properties(send1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
   set_target_properties(sendcplx PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(sendfort PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  set_target_properties(sendfort PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 #  set_target_properties(structf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(typebasef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  endif(SMPI_F2C)
-endif(enable_smpi)
+  set_target_properties(typebasef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  endif()
+endif()
 
 set(tesh_files
   ${tesh_files}