From: navarro Date: Thu, 14 Jun 2012 21:42:47 +0000 (+0200) Subject: 2nd part of kill GLOB_RECURSE X-Git-Tag: v3_8~597 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/44beaef095a65d59893cd97a4df24cab8ee475b0 2nd part of kill GLOB_RECURSE --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index ec1a1f0d16..3884f5f853 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -330,15 +330,24 @@ set(BINDINGS_SRC ) set(LUA_SRC - src/bindings/lua/simgrid_lua.c - src/bindings/lua/lua_task.c - src/bindings/lua/lua_comm.c - src/bindings/lua/lua_host.c - src/bindings/lua/lua_process.c - src/bindings/lua/lua_platf.c - src/bindings/lua/lua_utils.c - src/bindings/lua/lua_state_cloner.c - src/bindings/lua/lua_stub_generator.c + src/bindings/lua/simgrid_lua.c + src/bindings/lua/lua_task.c + src/bindings/lua/lua_comm.c + src/bindings/lua/lua_host.c + src/bindings/lua/lua_process.c + src/bindings/lua/lua_platf.c + src/bindings/lua/lua_utils.c + src/bindings/lua/lua_state_cloner.c + src/bindings/lua/lua_stub_generator.c +) + +set(BINDINGS_FILES + ${LUA_SRC} + src/bindings/lua/simgrid_lua.h + src/bindings/lua/lua_utils.h + src/bindings/lua/lua_state_cloner.h + src/bindings/lua/lua_private.h + src/bindings/bindings_global.c ) set(TRACING_SRC @@ -662,41 +671,14 @@ set(DOC_FIGS ${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig ) -file(GLOB_RECURSE add_src_files -"testsuite/*.c" -"testsuite/*.cxx" -"testsuite/*CMakeLists.txt" -"tools/*.c" -"tools/*.cxx" -"tools/*CMakeLists.txt" -"src/bindings/*.lua" -"src/bindings/*.rb" -"src/bindings/*.c" -"src/bindings/*.h" -"src/bindings/*CMakeLists.txt" -) -set(add_src_files - ${add_src_files} +set(bin_files + ${bin_files} src/smpi/smpicc.in src/smpi/smpif2c.in src/smpi/smpiff.in src/smpi/smpirun.in ) -file(GLOB_RECURSE xml_files -"include/*.xml" -"src/*.xml" -"testsuite/*.xml" -"tools/*.xml" -) - -file(GLOB_RECURSE tesh_files -"include/*.tesh" -"src/*.tesh" -"testsuite/*.tesh" -"tools/*.tesh" -) - set(txt_files ${txt_files} "testsuite/surf/trace_A_failure.txt" @@ -712,13 +694,6 @@ ${txt_files} INSTALL ) -set(bin_files - ${bin_files} - tools/MSG_visualization/colorize.pl - tools/sg_unit_extractor.pl - tools/simgrid_update_xml.pl -) - set(EXAMPLES_CMAKEFILES_TXT examples/smpi/CMakeLists.txt examples/amok/saturate/CMakeLists.txt @@ -785,6 +760,18 @@ teshsuite/CMakeLists.txt teshsuite/gras/CMakeLists.txt ) +set(TOOLS_CMAKEFILES_TXT +tools/tesh/CMakeLists.txt +tools/graphicator/CMakeLists.txt +tools/CMakeLists.txt +tools/gras/CMakeLists.txt +) + +set(TESTSUITE_CMAKEFILES_TXT +testsuite/surf/CMakeLists.txt +testsuite/xbt/CMakeLists.txt +) + set(CMAKE_SOURCE_FILES buildtools/Cmake/CTestConfig.cmake buildtools/Cmake/UnitTesting.cmake diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index b5889af4be..0e2efbac86 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -197,10 +197,12 @@ set(source_to_pack ${MC_SRC} ${JEDULE_SRC} ${RNGSTREAM_SRC} - ${add_src_files} + ${BINDINGS_FILES} ${CMAKE_SOURCE_FILES} ${EXAMPLES_CMAKEFILES_TXT} ${TESHSUITE_CMAKEFILES_TXT} + ${TOOLS_CMAKEFILES_TXT} + ${TESTSUITE_CMAKEFILES_TXT} ${DOC_SOURCES} ${DOC_FIGS} ${README_files} @@ -210,6 +212,8 @@ set(source_to_pack ${bin_files} ${examples_src} ${teshsuite_src} + ${tools_src} + ${testsuite_src} ) ########################################## diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index 75b58b6979..0568e2af23 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -2,34 +2,23 @@ ### Load all files declaring binaries (tools, examples and tests) # ################################################################### ################################################################## -# Those CMakelists or just here to define extra files in dist # +# Those CMakelists are just added to define files in dist # add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/lua) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/xbt) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools) ################################################################## add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras) - -if(WIN32) - add_custom_target(tesh ALL - DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl - COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl" - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh - ) -else(WIN32) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh) -endif(WIN32) - +add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh) 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) -if(NOT WIN32) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc) -endif(NOT WIN32) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/small_sleep) @@ -70,22 +59,11 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/io) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/cloud) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gpu) - -if(HAVE_TRACING) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing) -endif(HAVE_TRACING) - -if(HAVE_MC) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc) -endif(HAVE_MC) - +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets) - -if(HAVE_NS3) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/ns3) -endif(HAVE_NS3) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/ns3) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/saturate) @@ -93,13 +71,9 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/saturate) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dax) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/goal) -if(HAVE_GRAPHVIZ) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot) -endif(HAVE_GRAPHVIZ) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/metaxml) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling) -if(enable_smpi) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi) -endif(enable_smpi) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi) \ No newline at end of file diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt index b093ccf319..cd4b63f33a 100644 --- a/examples/msg/mc/CMakeLists.txt +++ b/examples/msg/mc/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 2.6) +if(HAVE_MC) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(centralized centralized_mutex.c) @@ -29,6 +30,7 @@ target_link_libraries(bugged2_liveness simgrid m ) target_link_libraries(centralized_liveness simgrid m ) target_link_libraries(centralized_liveness_deadlock simgrid m ) target_link_libraries(test_snapshot simgrid m ) +endif(HAVE_MC) set(tesh_files ${tesh_files} @@ -44,7 +46,7 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2_liveness.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged3.xml - ${CMAKE_CURRENT_SOURCE_DIR}/deploy_cennralized_liveness.xml + ${CMAKE_CURRENT_SOURCE_DIR}/deploy_centralized_liveness.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_mutex.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_random_test.xml ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml @@ -52,7 +54,7 @@ set(xml_files ) set(examples_src ${examples_src} - ${CMAKE_CURRENT_SOURCE_DIR}/automanon.c + ${CMAKE_CURRENT_SOURCE_DIR}/automaton.c ${CMAKE_CURRENT_SOURCE_DIR}/automatonparse_promela.c ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.c ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_for_liveness.c @@ -64,7 +66,7 @@ set(examples_src ${CMAKE_CURRENT_SOURCE_DIR}/bugged3.c ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness.c ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness_deadlock.c - ${CMAKE_CURRENT_SOURCE_DIR}/centralized_munex.c + ${CMAKE_CURRENT_SOURCE_DIR}/centralized_mutex.c ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c ${CMAKE_CURRENT_SOURCE_DIR}/random_test.c ${CMAKE_CURRENT_SOURCE_DIR}/test_snapshot.c diff --git a/examples/msg/ns3/CMakeLists.txt b/examples/msg/ns3/CMakeLists.txt index 41df0b42e5..0cf5a76a46 100644 --- a/examples/msg/ns3/CMakeLists.txt +++ b/examples/msg/ns3/CMakeLists.txt @@ -1,11 +1,13 @@ cmake_minimum_required(VERSION 2.6) +if(HAVE_NS3) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(ns3 "ns3.c") ### Add definitions for compile target_link_libraries(ns3 simgrid m ) +endif(HAVE_NS3) set(tesh_files ${tesh_files} @@ -14,15 +16,15 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/3hosns_2links_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/3hosns_2links_p.xml - ${CMAKE_CURRENT_SOURCE_DIR}/3links-d-nimer.xml + ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_p.xml + ${CMAKE_CURRENT_SOURCE_DIR}/3links-d-timer.xml ${CMAKE_CURRENT_SOURCE_DIR}/3links-d.xml ${CMAKE_CURRENT_SOURCE_DIR}/3links-p.xml ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-p.xml - ${CMAKE_CURRENT_SOURCE_DIR}/One_clusner-d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/Two_clusners-d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/One_cluster-d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/Two_clusters-d.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt index 679a97ace3..022302f0e7 100644 --- a/examples/msg/tracing/CMakeLists.txt +++ b/examples/msg/tracing/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 2.6) +if(HAVE_TRACING) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(LIBRARY_OUTPUT_PATH "${CMAKE_HOME_DIRECTORY}/lib") @@ -28,38 +29,44 @@ set_directory_properties( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;" ) +endif(HAVE_TRACING) set(tesh_files ${tesh_files} - ${CMAKE_CURRENT_BINARY_DIR}/categories.tesh - ${CMAKE_CURRENT_BINARY_DIR}/link_srcdst_user_variables.tesh - ${CMAKE_CURRENT_BINARY_DIR}/link_user_variables.tesh - ${CMAKE_CURRENT_BINARY_DIR}/ms.tesh - ${CMAKE_CURRENT_BINARY_DIR}/procmig.tesh - ${CMAKE_CURRENT_BINARY_DIR}/trace_platform.tesh - ${CMAKE_CURRENT_BINARY_DIR}/user_variables.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/categories.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/link_srcdst_user_variables.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/link_user_variables.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/ms.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/procmig.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.tesh + PARENT_SCOPE ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_BINARY_DIR}/deployment.xml - ${CMAKE_CURRENT_BINARY_DIR}/platform.xml - ${CMAKE_CURRENT_BINARY_DIR}/procmig-deploy.xml + ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml + ${CMAKE_CURRENT_SOURCE_DIR}/procmig-deploy.xml + PARENT_SCOPE ) set(examples_src ${examples_src} - ${CMAKE_CURRENT_BINARY_DIR}/categories.c - ${CMAKE_CURRENT_BINARY_DIR}/link_srcdst_user_variables.c - ${CMAKE_CURRENT_BINARY_DIR}/link_user_variables.c - ${CMAKE_CURRENT_BINARY_DIR}/ms.c - ${CMAKE_CURRENT_BINARY_DIR}/procmig.c - ${CMAKE_CURRENT_BINARY_DIR}/simple.c - ${CMAKE_CURRENT_BINARY_DIR}/trace_platform.c - ${CMAKE_CURRENT_BINARY_DIR}/user_variables.c + ${CMAKE_CURRENT_SOURCE_DIR}/categories.c + ${CMAKE_CURRENT_SOURCE_DIR}/link_srcdst_user_variables.c + ${CMAKE_CURRENT_SOURCE_DIR}/link_user_variables.c + ${CMAKE_CURRENT_SOURCE_DIR}/ms.c + ${CMAKE_CURRENT_SOURCE_DIR}/procmig.c + ${CMAKE_CURRENT_SOURCE_DIR}/simple.c + ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.c + ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.c + PARENT_SCOPE ) set(bin_files ${bin_files} + PARENT_SCOPE ) set(txt_files ${txt_files} + PARENT_SCOPE ) \ No newline at end of file diff --git a/examples/simdag/dot/CMakeLists.txt b/examples/simdag/dot/CMakeLists.txt index 97408b0341..d5de29c2d6 100644 --- a/examples/simdag/dot/CMakeLists.txt +++ b/examples/simdag/dot/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 2.6) +if(HAVE_GRAPHVIZ) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") #add_executable( ) @@ -25,6 +26,7 @@ else(NOT WIN32) PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/dot_test; ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot;") endif(NOT WIN32) +endif(HAVE_GRAPHVIZ) set(tesh_files ${tesh_files} diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index c086d0ceac..92cf0826f6 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 2.6) +if(enable_smpi) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/bin/smpicc") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") @@ -53,6 +54,7 @@ target_link_libraries(mc_bugged1 m simgrid smpi ) target_link_libraries(mc_bugged2 m simgrid smpi ) set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv) +endif(enable_smpi) set(tesh_files ${tesh_files} diff --git a/teshsuite/gras/datadesc/CMakeLists.txt b/teshsuite/gras/datadesc/CMakeLists.txt index 88d30b1a8b..b7fb5fd65a 100644 --- a/teshsuite/gras/datadesc/CMakeLists.txt +++ b/teshsuite/gras/datadesc/CMakeLists.txt @@ -1,14 +1,12 @@ cmake_minimum_required(VERSION 2.6) +if(NOT WIN32) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(datadesc_usage datadesc_usage.c datadesc_structs.c) ### Add definitions for compile -if(NOT WIN32) - target_link_libraries(datadesc_usage gras m pthread) -elseif(NOT WIN32) - target_link_libraries(datadesc_usage gras) +target_link_libraries(datadesc_usage gras m pthread) endif(NOT WIN32) set(tesh_files diff --git a/testsuite/surf/CMakeLists.txt b/testsuite/surf/CMakeLists.txt index e43a063976..b0d2a51147 100644 --- a/testsuite/surf/CMakeLists.txt +++ b/testsuite/surf/CMakeLists.txt @@ -10,16 +10,47 @@ add_executable(trace_usage "trace_usage.c") ### Add definitions for compile if(NOT WIN32) -target_link_libraries(lmm_usage simgrid m ) -target_link_libraries(maxmin_bench simgrid m ) -target_link_libraries(surf_usage simgrid m ) -target_link_libraries(surf_usage2 simgrid m ) -target_link_libraries(trace_usage simgrid m ) + target_link_libraries(lmm_usage simgrid m ) + target_link_libraries(maxmin_bench simgrid m ) + target_link_libraries(surf_usage simgrid m ) + target_link_libraries(surf_usage2 simgrid m ) + target_link_libraries(trace_usage simgrid m ) else(NOT WIN32) -target_link_libraries(lmm_usage simgrid ) -target_link_libraries(maxmin_bench simgrid ) -set_target_properties(maxmin_bench PROPERTIES COMPILE_FLAGS "-DDLL_STATIC") -target_link_libraries(surf_usage simgrid ) -target_link_libraries(surf_usage2 simgrid ) -target_link_libraries(trace_usage simgrid ) + target_link_libraries(lmm_usage simgrid ) + target_link_libraries(maxmin_bench simgrid ) + set_target_properties(maxmin_bench PROPERTIES COMPILE_FLAGS "-DDLL_STATIC") + target_link_libraries(surf_usage simgrid ) + target_link_libraries(surf_usage2 simgrid ) + target_link_libraries(trace_usage simgrid ) endif(NOT WIN32) + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/simeng_usage.tesh + PARENT_SCOPE +) +set(xml_files + ${xml_files} + ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml + PARENT_SCOPE +) +set(testsuite_src + ${testsuite_src} + ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.c + ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench.c + ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage.c + ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage2.c + ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.c + PARENT_SCOPE +) +set(bin_files + ${bin_files} + PARENT_SCOPE +) +set(txt_files + ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/trace_A_failure.txt + ${CMAKE_CURRENT_SOURCE_DIR}/trace_A.txt + ${CMAKE_CURRENT_SOURCE_DIR}/trace_B.txt + PARENT_SCOPE +) \ No newline at end of file diff --git a/testsuite/xbt/CMakeLists.txt b/testsuite/xbt/CMakeLists.txt index 72310077e8..e2356877b6 100644 --- a/testsuite/xbt/CMakeLists.txt +++ b/testsuite/xbt/CMakeLists.txt @@ -9,13 +9,40 @@ add_executable(parmap_bench "parmap_bench.c") ### Add definitions for compile if(NOT WIN32) -target_link_libraries(log_usage gras m ) -target_link_libraries(graphxml_usage simgrid m ) -target_link_libraries(heap_bench gras m ) -target_link_libraries(parmap_bench simgrid m ) + target_link_libraries(log_usage gras m ) + target_link_libraries(graphxml_usage simgrid m ) + target_link_libraries(heap_bench gras m ) + target_link_libraries(parmap_bench simgrid m ) else(NOT WIN32) -target_link_libraries(log_usage gras ) -target_link_libraries(graphxml_usage simgrid ) -target_link_libraries(heap_bench gras ) -target_link_libraries(parmap_bench simgrid ) + target_link_libraries(log_usage gras ) + target_link_libraries(graphxml_usage simgrid ) + target_link_libraries(heap_bench gras ) + target_link_libraries(parmap_bench simgrid ) endif(NOT WIN32) + + +set(tesh_files + ${tesh_files} + PARENT_SCOPE +) +set(xml_files + ${xml_files} + ${CMAKE_CURRENT_SOURCE_DIR}/graph.xml + PARENT_SCOPE +) +set(testsuite_src + ${testsuite_src} + ${CMAKE_CURRENT_SOURCE_DIR}/graphxml_usage.c + ${CMAKE_CURRENT_SOURCE_DIR}/heap_bench.c + ${CMAKE_CURRENT_SOURCE_DIR}/log_usage.c + ${CMAKE_CURRENT_SOURCE_DIR}/parmap_bench.c + PARENT_SCOPE +) +set(bin_files + ${bin_files} + PARENT_SCOPE +) +set(txt_files + ${txt_files} + PARENT_SCOPE +) \ No newline at end of file diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt new file mode 100644 index 0000000000..a65f8eeec1 --- /dev/null +++ b/tools/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 2.6) + +set(bin_files + ${bin_files} + ${CMAKE_CURRENT_SOURCE_DIR}/compile-stats + ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh + ${CMAKE_CURRENT_SOURCE_DIR}/indent + ${CMAKE_CURRENT_SOURCE_DIR}/sg_unit_extractor.pl + ${CMAKE_CURRENT_SOURCE_DIR}/simgrid_update_xml.pl + ${CMAKE_CURRENT_SOURCE_DIR}/xbt_exception_checker + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/doxygen_postprocesser.pl + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/index_php.pl + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/bibtex2html_wrapper.pl + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/bibtex2html_table_count.pl + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/index_create.pl + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/fig2dev_postprocessor.pl + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/xbt_log_extract_hierarchy.pl + ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/toc_create.pl + ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/colorize.pl + ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/trace2fig.pl + PARENT_SCOPE +) \ No newline at end of file diff --git a/tools/graphicator/CMakeLists.txt b/tools/graphicator/CMakeLists.txt index cc767c74d6..c8a1f8be43 100644 --- a/tools/graphicator/CMakeLists.txt +++ b/tools/graphicator/CMakeLists.txt @@ -16,3 +16,26 @@ get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) set_directory_properties( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/simgrid.trace;") + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/graphicator.tesh + PARENT_SCOPE +) +set(xml_files + ${xml_files} + PARENT_SCOPE +) +set(tools_src + ${tools_src} + ${CMAKE_CURRENT_SOURCE_DIR}/graphicator.c + PARENT_SCOPE +) +set(bin_files + ${bin_files} + PARENT_SCOPE +) +set(txt_files + ${txt_files} + PARENT_SCOPE +) \ No newline at end of file diff --git a/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt index 8a5f391931..343e245396 100644 --- a/tools/gras/CMakeLists.txt +++ b/tools/gras/CMakeLists.txt @@ -12,4 +12,35 @@ if(NOT WIN32) else(NOT WIN32) target_link_libraries(gras_stub_generator simgrid) target_link_libraries(struct_diff simgrid) -endif(NOT WIN32) \ No newline at end of file +endif(NOT WIN32) + +set(tesh_files + ${tesh_files} + PARENT_SCOPE +) +set(xml_files + ${xml_files} + PARENT_SCOPE +) +set(tools_src + ${tools_src} + ${CMAKE_CURRENT_SOURCE_DIR}/windows_stub_generator.c + ${CMAKE_CURRENT_SOURCE_DIR}/unix_stub_generator.c + ${CMAKE_CURRENT_SOURCE_DIR}/struct_diff.c + ${CMAKE_CURRENT_SOURCE_DIR}/stub_generator.c + ${CMAKE_CURRENT_SOURCE_DIR}/gras_stub_generator.h + PARENT_SCOPE +) +set(bin_files + ${bin_files} + ${CMAKE_CURRENT_SOURCE_DIR}/s_smx_process_t + ${CMAKE_CURRENT_SOURCE_DIR}/s_smx_simcall_t + ${CMAKE_CURRENT_SOURCE_DIR}/stub_generator4borland.mak + ${CMAKE_CURRENT_SOURCE_DIR}/stub_generator.bpf + ${CMAKE_CURRENT_SOURCE_DIR}/stub_generator.bpr + PARENT_SCOPE +) +set(txt_files + ${txt_files} + PARENT_SCOPE +) \ No newline at end of file diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt index d128cbb4f9..42240c9c16 100644 --- a/tools/tesh/CMakeLists.txt +++ b/tools/tesh/CMakeLists.txt @@ -1,8 +1,62 @@ cmake_minimum_required(VERSION 2.6) +if(WIN32) + add_custom_target(tesh ALL + DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl + COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl" + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh + ) +else(WIN32) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") add_executable(tesh tesh.c run_context.c signal.c) ### Add definitions for compile target_link_libraries(tesh gras m pthread) +endif(WIN32) + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/setenv.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/set-ignore-output.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/set-return.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/set-signal.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/set-timeout.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/background.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/basic2.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/basic.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/bg-basic.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/bg-set-signal.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/catch-return.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/catch-signal.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/catch-timeout.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/catch-wrong-output.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/cd.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/IO-bigsize.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/IO-broken-pipe.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/IO-orders.tesh + PARENT_SCOPE +) +set(xml_files + ${xml_files} + PARENT_SCOPE +) +set(tools_src + ${tools_src} + ${CMAKE_CURRENT_SOURCE_DIR}/run_context.c + ${CMAKE_CURRENT_SOURCE_DIR}/run_context.h + ${CMAKE_CURRENT_SOURCE_DIR}/signal.c + ${CMAKE_CURRENT_SOURCE_DIR}/tesh.c + ${CMAKE_CURRENT_SOURCE_DIR}/tesh.h + PARENT_SCOPE +) +set(bin_files + ${bin_files} + ${CMAKE_CURRENT_SOURCE_DIR}/colorize.pl + PARENT_SCOPE +) +set(txt_files + ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/README + PARENT_SCOPE +) \ No newline at end of file