Don't build smpi in a separate library anymore.

[simgrid.git] / examples / smpi / MM / CMakeLists.txt

diff --git a/examples/smpi/MM/CMakeLists.txt b/examples/smpi/MM/CMakeLists.txt
index a4a1c2f..366f39c 100644 (file)
--- a/examples/smpi/MM/CMakeLists.txt
+++ b/examples/smpi/MM/CMakeLists.txt
@@ -1,21 +1,16 @@
 cmake_minimum_required(VERSION 2.6)
 
 if(enable_smpi)
-  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/bin/smpicc")
-
+  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c timer.c topo.c param.c Matrix_init.c)
-
-### Add definitions for compile
-if(NOT WIN32)
-  target_link_libraries(MM_mpi simgrid pthread m smpi)
-else(NOT WIN32)
-  target_link_libraries(MM_mpi simgrid smpi)
-endif(NOT WIN32)
-endif(enable_smpi)
+  if(NOT WIN32)
+    add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c)
+    ### Add definitions for compile
+    target_link_libraries(MM_mpi simgrid pthread)
+  endif()
+endif()
 
 set(tesh_files
   ${tesh_files}
@@ -30,10 +25,10 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/MM_mpi.c
   ${CMAKE_CURRENT_SOURCE_DIR}/2.5D_MM.c
   ${CMAKE_CURRENT_SOURCE_DIR}/Summa.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/timer.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/topo.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/param.c
   ${CMAKE_CURRENT_SOURCE_DIR}/Matrix_init.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/2.5D_MM.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/Summa.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/Matrix_init.h
   PARENT_SCOPE
   )
 set(bin_files