From 1d9136dcefea8e3dfa3dc18eac9d9c2eb479a49e Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 13 Oct 2010 13:57:10 +0000 Subject: [PATCH] Add simgrid dependency for ping_generator.lua 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 | 1 - examples/gras/console/CMakeLists.txt | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake index c776af12fb..99fd1e0a75 100644 --- a/buildtools/Cmake/MakeExeLib.cmake +++ b/buildtools/Cmake/MakeExeLib.cmake @@ -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..." ) diff --git a/examples/gras/console/CMakeLists.txt b/examples/gras/console/CMakeLists.txt index 13a7025d57..72bfb7f8ef 100644 --- a/examples/gras/console/CMakeLists.txt +++ b/examples/gras/console/CMakeLists.txt @@ -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) -- 2.20.1