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

diff --cc examples/smpi/NAS/CMakeLists.txt
index 804ec75,0000000..b4de3b0
mode 100644,000000..100644
--- 1/examples/smpi/NAS/CMakeLists.txt
--- /dev/null
+++ b/examples/smpi/NAS/CMakeLists.txt
@@@ -1,26 -1,0 +1,25 @@@
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/setparams.c
 +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}/dt-folding.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/is.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/dt.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/ep.c
-                                                                              PARENT_SCOPE)
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/DGraph.c
 +                                   ${CMAKE_CURRENT_SOURCE_DIR}/DGraph.h
++                                                                              PARENT_SCOPE)
++set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/README.install  PARENT_SCOPE)

diff --cc tools/cmake/DefinePackages.cmake
Simple merge