From: navarrop Date: Fri, 12 Feb 2010 10:15:15 +0000 (+0000) Subject: Clean some unused source lines. X-Git-Tag: SVN~647 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/357161726548d2482a45d6bfc3d12befe6ebb72d Clean some unused source lines. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7088 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt index 9bcb074cab..9b4fd4520d 100644 --- a/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt @@ -26,6 +26,8 @@ set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/.libs") set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include -L${gtnets_path}/lib") set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY}) +add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) + ### Setup Options include(${PROJECT_DIRECTORY}/CPACK/src/CMakeOption.txt) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/amok/bandwidth/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/amok/bandwidth/CMakeLists.txt index 3597e3058e..06935efedd 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/amok/bandwidth/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/amok/bandwidth/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(bandwidth_simulator _bandwidth_simulator.c bandwidth.c) add_executable(bandwidth_maestro _bandwidth_maestro.c bandwidth.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/amok/saturate/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/amok/saturate/CMakeLists.txt index c559455ca7..d9a6a70884 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/amok/saturate/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/amok/saturate/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(saturate_simulator _saturate_simulator.c saturate.c) add_executable(saturate_maestro _saturate_maestro.c saturate.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/all2all/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/all2all/CMakeLists.txt index 8b0f6765d7..90ed053c8e 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/all2all/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/all2all/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(all2all_simulator _all2all_simulator.c all2all.c) add_executable(all2all_sender _all2all_sender.c all2all.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/chrono/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/chrono/CMakeLists.txt index 5beed04cc4..404fbd5a3c 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/chrono/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/chrono/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(chrono_simulator _chrono_simulator.c chrono.c) add_executable(chrono_multiplier _chrono_multiplier.c chrono.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/mmrpc/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/mmrpc/CMakeLists.txt index a877f96ee6..eda87797e1 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/mmrpc/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/mmrpc/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(mmrpc_simulator _mmrpc_simulator.c mmrpc_common.c mmrpc_client.c mmrpc_server.c) add_executable(mmrpc_client _mmrpc_client.c mmrpc_common.c mmrpc_client.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt index f329066540..be862920c9 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(simple_token_simulator _simple_token_simulator.c simple_token.c) add_executable(simple_token_node _simple_token_node.c simple_token.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/ping/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/ping/CMakeLists.txt index 1542825b66..c0a1c3b7e0 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/ping/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/ping/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(ping_simulator _ping_simulator.c ping_server.c ping_client.c ping_common.c) add_executable(ping_client _ping_client.c ping_client.c ping_common.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/pmm/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/pmm/CMakeLists.txt index 2aeede8c0a..d5537c90bd 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/pmm/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/pmm/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(pmm_simulator _pmm_simulator.c pmm.c) add_executable(pmm_slave _pmm_slave.c pmm.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/properties/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/properties/CMakeLists.txt index 06c521ef4f..aa04b4f628 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/properties/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/properties/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(properties_simulator _properties_simulator.c properties.c) add_executable(properties_alice _properties_alice.c properties.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/rpc/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/rpc/CMakeLists.txt index f7fb5c3ebb..cbf81096d9 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/rpc/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/rpc/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(rpc_simulator _rpc_simulator.c rpc.c) add_executable(rpc_client _rpc_client.c rpc.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/spawn/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/spawn/CMakeLists.txt index a82c7ccdc7..621a8e30eb 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/spawn/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/spawn/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(spawn_simulator _spawn_simulator.c spawn_father.c spawn_child.c spawn_common.c) add_executable(spawn_child _spawn_child.c spawn_child.c spawn_common.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/synchro/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/synchro/CMakeLists.txt index 4a49542664..426381f43b 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/synchro/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/synchro/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(synchro_simulator _synchro_simulator.c philosopher.c) add_executable(synchro_philosopher _synchro_philosopher.c philosopher.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/gras/timer/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/gras/timer/CMakeLists.txt index 4aa32785df..bfacca9251 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/gras/timer/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/gras/timer/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(timer_simulator _timer_simulator.c timer.c) add_executable(timer_client _timer_client.c timer.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/actions/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/actions/CMakeLists.txt index b463a7d636..5272da6aca 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/actions/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/actions/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(actions actions.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/masterslave/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/masterslave/CMakeLists.txt index f4f6a49ddb..09e8a3b044 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/masterslave/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/masterslave/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(masterslave_failure "masterslave_failure.c") add_executable(masterslave_forwarder "masterslave_forwarder.c") diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/migration/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/migration/CMakeLists.txt index a84ad82aff..28ba312aa5 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/migration/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/migration/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(migration migration.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/parallel_task/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/parallel_task/CMakeLists.txt index ffc6510ffb..bb8d71a281 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/parallel_task/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/parallel_task/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(parallel_task parallel_task.c) add_executable(test_ptask test_ptask.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/priority/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/priority/CMakeLists.txt index e39906401e..0f1faef010 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/priority/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/priority/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(priority priority.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/properties/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/properties/CMakeLists.txt index 0f175c8be9..0cb82e328e 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/properties/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/properties/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(msg_prop msg_prop.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/sendrecv/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/sendrecv/CMakeLists.txt index ea4c385ff3..1f93a21376 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/sendrecv/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/sendrecv/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(sendrecv sendrecv.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/suspend/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/suspend/CMakeLists.txt index ef0b1c4143..1e19a896bd 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/suspend/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/suspend/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(suspend suspend.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/msg/trace/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/msg/trace/CMakeLists.txt index 60f5dc19bc..e801bf02b9 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/msg/trace/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/msg/trace/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(test_trace_integration test_trace_integration.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/CMakeLists.txt index 9e6420b957..da8c5fda7f 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(ex_sd_test sd_test.c) add_executable(ex_sd_test2 sd_test2.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/dax/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/dax/CMakeLists.txt index b7ccaf3fea..49e8442f59 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/dax/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/dax/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(dax_test dax_test.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/metaxml/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/metaxml/CMakeLists.txt index 26e0c75c56..d3a327e82e 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/metaxml/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/metaxml/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(sd_meta sd_meta.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/properties/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/properties/CMakeLists.txt index a11f617ab4..8fb5c6f551 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/simdag/properties/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/simdag/properties/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(sd_prop sd_prop.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt index 434948ff6f..68d8c5db40 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt @@ -3,10 +3,10 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") set(flags "-Dmain=smpi_simulated_main") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include -I${PROJECT_DIRECTORY}/include/smpi") +set(INCLUDES_bis "-I${PROJECT_DIRECTORY}/include/smpi") set(CMAKE_C_FLAGS "") -add_definitions (${INCLUDES} ${flags} -fprofile-arcs -ftest-coverage) +add_definitions (${INCLUDES_bis} ${flags}) add_executable(alltoall2 alltoall2.c ) add_executable(alltoall_basic alltoall_basic.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/datadesc/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/datadesc/CMakeLists.txt index 3b271793fb..854af4e3d6 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/datadesc/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/datadesc/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(datadesc_usage datadesc_usage.c datadesc_structs.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/msg_handle/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/msg_handle/CMakeLists.txt index 756c147642..c286e4125e 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/msg_handle/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/msg_handle/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(msg_handle_simulator msg_handle.c _msg_handle_simulator.c) add_executable(msg_handle_client msg_handle.c _msg_handle_client.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/msg/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/msg/CMakeLists.txt index 20d5d767e2..637a256dc3 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/msg/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/msg/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(get_sender get_sender.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/CMakeLists.txt index 2ece2dc525..55365c0f68 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(basic0 basic0.c) add_executable(basic1 basic1.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/CMakeLists.txt index 1cec2235e6..f65cb8fc7a 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(test_reinit_costs test_reinit_costs.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/mxn/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/mxn/CMakeLists.txt index 4919391334..02e17554db 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/mxn/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/mxn/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(test_intra_all2all test_intra_all2all.c) add_executable(test_intra_independent_comm test_intra_independent_comm.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/p2p/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/p2p/CMakeLists.txt index 60b3a771ee..bdad24380c 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/p2p/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/network/p2p/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(test_latency1 test_latency1.c) add_executable(test_latency2 test_latency2.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/partask/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/partask/CMakeLists.txt index e636d9b7b6..7c66c581fe 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/partask/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/partask/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(test_comp_only_seq test_comp_only_seq.c) add_executable(test_comp_only_par test_comp_only_par.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/platforms/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/platforms/CMakeLists.txt index dc77ef63c0..9afac45eb3 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/platforms/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/simdag/platforms/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(basic_parsing_test basic_parsing_test.c) add_executable(flatifier flatifier.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/teshsuite/xbt/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/teshsuite/xbt/CMakeLists.txt index cba0956158..2349d4965a 100644 --- a/buildtools/CPACK/simgrid_CMakeList/teshsuite/xbt/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/teshsuite/xbt/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(log_large_test log_large_test.c) add_executable(parallel_log_crashtest parallel_log_crashtest.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/testsuite/simdag/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/testsuite/simdag/CMakeLists.txt index 494ef1d06b..e1448df074 100644 --- a/buildtools/CPACK/simgrid_CMakeList/testsuite/simdag/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/testsuite/simdag/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(sd_test "sd_test.c") diff --git a/buildtools/CPACK/simgrid_CMakeList/testsuite/surf/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/testsuite/surf/CMakeLists.txt index c4633f9a34..c2abf460d8 100644 --- a/buildtools/CPACK/simgrid_CMakeList/testsuite/surf/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/testsuite/surf/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(lmm_usage "lmm_usage.c") add_executable(maxmin_bench "maxmin_bench.c") diff --git a/buildtools/CPACK/simgrid_CMakeList/testsuite/xbt/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/testsuite/xbt/CMakeLists.txt index 2a8090fe4f..f95dbb6ece 100644 --- a/buildtools/CPACK/simgrid_CMakeList/testsuite/xbt/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/testsuite/xbt/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(log_usage "log_usage.c") add_executable(graphxml_usage "graphxml_usage.c") diff --git a/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt index 9f7bb041fa..6953ce6255 100644 --- a/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/tools/gras/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(gras_stub_generator stub_generator.c unix_stub_generator.c windows_stub_generator.c) diff --git a/buildtools/CPACK/simgrid_CMakeList/tools/tesh/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/tools/tesh/CMakeLists.txt index 26a9261d39..42b917e85d 100644 --- a/buildtools/CPACK/simgrid_CMakeList/tools/tesh/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/tools/tesh/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "./") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include") - -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) add_executable(tesh tesh.c run_context.c signal.c) diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt index aa675930ef..abb4ba1bf9 100644 --- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt +++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt @@ -308,7 +308,7 @@ SET(SIZEOF_MAX ${var3}) CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT) #message("HAVE_MAKECONTEXT ${HAVE_MAKECONTEXT}") - +set(makecontext_CPPFLAGS_2 "") if(HAVE_MAKECONTEXT) set(makecontext_CPPFLAGS "-DTEST_makecontext") if(CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -316,15 +316,17 @@ if(HAVE_MAKECONTEXT) #message("SYSTEM OSX") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - exec_program("${CMAKE_C_COMPILER} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_stacksetup.c ${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}" OUTPUT_VARIABLE COMPILE_makecontext_VAR) - exec_program("${PROJECT_DIRECTORY}/CPACK/prog_test/a.out" OUTPUT_VARIABLE COMPILE_makecontext_VAR) - + try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR + ${PROJECT_DIRECTORY} + ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_stacksetup.c + COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}" + ) find_program(CAT_EXE NAMES cat) - exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/CPACK/prog_test/conftestval" OUTPUT_VARIABLE "makecontext_addr") - exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/CPACK/prog_test/conftestval" OUTPUT_VARIABLE "makecontext_size") - #message("${makecontext_addr}") - #message("${makecontext_size}") + exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_addr") + exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_size") + message("${makecontext_addr}") + message("${makecontext_size}") set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})") set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})") diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt index 0caeecc209..70cdfc354d 100644 --- a/buildtools/CPACK/src/CMakeMakeExeLib.txt +++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt @@ -42,7 +42,7 @@ endif(HAVE_GTNETS) #set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage") #set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage") -add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) +#add_definitions (-fprofile-arcs -ftest-coverage) target_link_libraries(simgrid ${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS}-fprofile-arcs) target_link_libraries(gras ${GRAS_DEP} -fprofile-arcs) target_link_libraries(smpi -fprofile-arcs)