resolve cmakelists conflict

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

diff --git a/teshsuite/smpi/mpich-test/context/CMakeLists.txt b/teshsuite/smpi/mpich-test/context/CMakeLists.txt
index db189a0..4defd0f 100644 (file)
--- a/teshsuite/smpi/mpich-test/context/CMakeLists.txt
+++ b/teshsuite/smpi/mpich-test/context/CMakeLists.txt
@@ -1,9 +1,15 @@
 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")
+
+  if(WIN32)
+    set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
+  else()
+    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")
+  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")
 
@@ -24,19 +30,19 @@ if(enable_smpi)
   #add_executable(commnames_f commnamesf.f)
   endif()
 
-  target_link_libraries(attrerr m simgrid smpi )
- # target_link_libraries(attrt m simgrid smpi )
- # target_link_libraries(commnames m simgrid smpi )
-  target_link_libraries(groupcreate m simgrid smpi )
-  target_link_libraries(grouptest_mpich m simgrid smpi )
-  target_link_libraries(icdup m simgrid smpi )
-  target_link_libraries(ictest m simgrid smpi )
-  target_link_libraries(ictest2 m simgrid smpi )
-  target_link_libraries(ictest3 m simgrid smpi )
+  target_link_libraries(attrerr simgrid smpi )
+ # target_link_libraries(attrt simgrid smpi )
+ # target_link_libraries(commnames simgrid smpi )
+  target_link_libraries(groupcreate simgrid smpi )
+  target_link_libraries(grouptest_mpich simgrid smpi )
+  target_link_libraries(icdup simgrid smpi )
+  target_link_libraries(ictest simgrid smpi )
+  target_link_libraries(ictest2 simgrid smpi )
+  target_link_libraries(ictest3 simgrid smpi )
 
   if(SMPI_F2C)
-  #target_link_libraries(attrtest_f m simgrid smpi f2c)
-  #target_link_libraries(commnames_f m simgrid smpi f2c)
+  #target_link_libraries(attrtest_f simgrid smpi f2c)
+  #target_link_libraries(commnames_f simgrid smpi f2c)
   endif()
   
   set_target_properties(attrerr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -59,7 +65,6 @@ endif()
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/context.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -85,10 +90,14 @@ set(examples_src
   )
 set(bin_files
   ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../hostfile
   PARENT_SCOPE
   )
 set(txt_files
   ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/runtests
+  ${CMAKE_CURRENT_SOURCE_DIR}/attrt.std
+  ${CMAKE_CURRENT_SOURCE_DIR}/attrerr.std
+  ${CMAKE_CURRENT_SOURCE_DIR}/context.std
+  ${CMAKE_CURRENT_SOURCE_DIR}/commnames.std
   PARENT_SCOPE
   )