From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 10 Mar 2016 14:12:40 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_13~453
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bc48db087894fd960073b3120cebf90e6b2f8c02?hp=-c

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

bc48db087894fd960073b3120cebf90e6b2f8c02
diff --combined examples/smpi/NAS/CMakeLists.txt
index 804ec75451,0000000000..b4de3b0f4c
mode 100644,000000..100644
--- a/examples/smpi/NAS/CMakeLists.txt
+++ b/examples/smpi/NAS/CMakeLists.txt
@@@ -1,26 -1,0 +1,25 @@@
 +if(enable_smpi)
 +  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")
 +  endif()
 +
 +  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 +  add_executable       (is is.c nas_common.c)
 +  target_link_libraries(is simgrid m)
 +  add_executable       (ep ep.c nas_common.c)
 +  target_link_libraries(ep simgrid m)
 +  add_executable       (dt dt.c nas_common.c DGraph.c)
 +  target_link_libraries(dt simgrid m)
 +endif()
 +
 +set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/nas_common.h
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/nas_common.c
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/setparams.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/is.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/dt.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/ep.c
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/dt-folding.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/DGraph.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/DGraph.h
-                                                                              PARENT_SCOPE)
++                                                                              PARENT_SCOPE)
++set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/README.install  PARENT_SCOPE)
diff --combined tools/cmake/DefinePackages.cmake
index e6d711f49a,e7033d9fcb..ef11ae1ad3
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -14,7 -14,6 +14,6 @@@ set(EXTRA_DIS
    src/include/surf/maxmin.h
    src/include/surf/surf.h
    src/msg/msg_private.h
-   src/portable.h
    src/simdag/dax.dtd
    src/simdag/dax_dtd.c
    src/simdag/dax_dtd.h
@@@ -573,7 -572,6 +572,6 @@@ set(MC_SR
    src/mc/mc_unw.h
    src/mc/mc_unw.cpp
    src/mc/mc_unw_vmread.cpp
-   src/mc/mc_object_info.h
    src/mc/mc_checkpoint.cpp
    src/mc/mc_snapshot.h
    src/mc/mc_snapshot.cpp
@@@ -986,7 -984,6 +984,7 @@@ set(CMAKEFILES_TX
    examples/simdag/scheduling/CMakeLists.txt
    
    examples/smpi/CMakeLists.txt
 +  examples/smpi/NAS/CMakeLists.txt
    examples/smpi/smpi_msg_masterslave/CMakeLists.txt
    examples/smpi/replay_multiple/CMakeLists.txt
    examples/smpi/energy/CMakeLists.txt