Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
authorChristophe Thiéry <christopho128@gmail.com>
Mon, 18 Apr 2011 12:10:15 +0000 (14:10 +0200)
committerChristophe Thiéry <christopho128@gmail.com>
Mon, 18 Apr 2011 12:10:15 +0000 (14:10 +0200)
buildtools/Cmake/CompleteInFiles.cmake
examples/lua/SimSplay/simgrid.so [deleted symlink]

index 63de957..a3e93c3 100644 (file)
@@ -677,12 +677,14 @@ else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
        configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/hostfile ${CMAKE_BINARY_DIR}/examples/smpi/hostfile COPYONLY)
        configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY)
        configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
+       configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/platform.xml ${CMAKE_BINARY_DIR}/examples/msg/tracing/platform.xml COPYONLY)
        
        set(generate_files_to_clean
                ${generate_files_to_clean}
                ${CMAKE_BINARY_DIR}/examples/smpi/hostfile
                ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml
                ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml
+               ${CMAKE_BINARY_DIR}/examples/msg/tracing/platform.xml
                )
 endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 
diff --git a/examples/lua/SimSplay/simgrid.so b/examples/lua/SimSplay/simgrid.so
deleted file mode 120000 (symlink)
index df55d85..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../lib/libsimgrid.so
\ No newline at end of file