From ff7c02a39d0d8b10430509c322578e293fee8215 Mon Sep 17 00:00:00 2001 From: schnorr Date: Tue, 14 Dec 2010 14:22:51 +0000 Subject: [PATCH] moving graphicator from teshsuite to tools/graphicator/ git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9236 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/Distrib.cmake | 2 ++ buildtools/Cmake/MakeExeLib.cmake | 2 ++ teshsuite/simdag/platforms/CMakeLists.txt | 3 --- tools/graphicator/CMakeLists.txt | 13 +++++++++++++ .../platforms => tools/graphicator}/graphicator.c | 0 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 tools/graphicator/CMakeLists.txt rename {teshsuite/simdag/platforms => tools/graphicator}/graphicator.c (100%) diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 737aaa4299..0a4e8d4f98 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -24,6 +24,8 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) +install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/graphicator +DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/ diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake index 1d920f6480..fb130d2c33 100644 --- a/buildtools/Cmake/MakeExeLib.cmake +++ b/buildtools/Cmake/MakeExeLib.cmake @@ -175,6 +175,8 @@ else(WIN32) add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh) endif(WIN32) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/) + add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt) add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt) diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 8b07150514..4e960d0dfd 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -5,18 +5,15 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(basic_parsing_test basic_parsing_test.c) add_executable(is_router_test is_router_test.c) add_executable(flatifier flatifier.c) -add_executable(graphicator graphicator.c) ### Add definitions for compile if(NOT WIN32) target_link_libraries(basic_parsing_test simgrid m pthread ) target_link_libraries(is_router_test simgrid m pthread ) target_link_libraries(flatifier simgrid m pthread ) -target_link_libraries(graphicator simgrid m pthread ) else(NOT WIN32) target_link_libraries(basic_parsing_test simgrid) target_link_libraries(is_router_test simgrid) target_link_libraries(flatifier simgrid) -target_link_libraries(graphicator simgrid ) endif(NOT WIN32) diff --git a/tools/graphicator/CMakeLists.txt b/tools/graphicator/CMakeLists.txt new file mode 100644 index 0000000000..19ca440068 --- /dev/null +++ b/tools/graphicator/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 2.6) + +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") + +add_executable(graphicator graphicator.c) + +### Add definitions for compile +if(NOT WIN32) +target_link_libraries(graphicator simgrid m pthread ) +else(NOT WIN32) +target_link_libraries(graphicator simgrid ) +endif(NOT WIN32) + diff --git a/teshsuite/simdag/platforms/graphicator.c b/tools/graphicator/graphicator.c similarity index 100% rename from teshsuite/simdag/platforms/graphicator.c rename to tools/graphicator/graphicator.c -- 2.20.1