Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add simgrid dependency for ping_generator.lua
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 13 Oct 2010 13:57:10 +0000 (13:57 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 13 Oct 2010 13:57:10 +0000 (13:57 +0000)
Now make -j is available with lua.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8420 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/Cmake/MakeExeLib.cmake
examples/gras/console/CMakeLists.txt

index c776af1..99fd1e0 100644 (file)
@@ -59,7 +59,6 @@ if(HAVE_LUA)
          COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so #for test
          COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.so #for test
          COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/simdag/simgrid.so #for test
-         COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/gras/console/simgrid.so #for compil
          COMMENT "Generating libsimgrid.so link for binding lua..."
        )
        
index 13a7025..72bfb7f 100644 (file)
@@ -25,11 +25,12 @@ add_custom_command(
                                        OUTPUT  ${CMAKE_CURRENT_SOURCE_DIR}/_ping_simulator.c 
                                                ${CMAKE_CURRENT_SOURCE_DIR}/_ping_client.c 
                                                        ${CMAKE_CURRENT_SOURCE_DIR}/_ping_server.c
+                                       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${CMAKE_HOME_DIRECTORY}/examples/gras/console/simgrid.so
                                        COMMAND lua ${CMAKE_CURRENT_SOURCE_DIR}/ping_generator.lua
                                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} #needed to find simgrid.so. By default CMAKE_CURRENT_BINARY_DIR
                                        )
 ### Add definitions for compile
 target_link_libraries(ping_simulator_console simgrid pthread m )
-target_link_libraries(ping_client_console gras pthread m )
-target_link_libraries(ping_server_console gras pthread m )
+target_link_libraries(ping_client_console gras simgrid pthread m )
+target_link_libraries(ping_server_console gras simgrid pthread m )
 endif(HAVE_LUA)