diff --git a/cmake/bochs.cmake b/cmake/bochs.cmake index 54cbaea2..a0778c84 100644 --- a/cmake/bochs.cmake +++ b/cmake/bochs.cmake @@ -79,6 +79,7 @@ if(BUILD_BOCHS) include_directories(${PROJECT_SOURCE_DIR}/src/core ${CMAKE_BINARY_DIR}/src/core) add_executable(fail-client "${bochs_src_dir}/libfailbochs.a") target_link_libraries(fail-client "${bochs_src_dir}/libfailbochs.a" fail ${bochs_library_dependencies}) + install(TARGETS fail-client RUNTIME DESTINATION bin) # a few Bochs-specific passthrough targets: add_custom_target(bochsclean diff --git a/scripts/rebuild-bochs.sh b/scripts/rebuild-bochs.sh index 154cf3b2..0b646d1b 100755 --- a/scripts/rebuild-bochs.sh +++ b/scripts/rebuild-bochs.sh @@ -29,6 +29,7 @@ fi #export PATH=/fs/staff/hsc/bin/ccache:$PATH -nice make -j$FAIL_BUILD_PARALLEL fail-client 2>&1 | $(dirname $0)/colorize.pl 2>&1 +nice make -j$FAIL_BUILD_PARALLEL 2>&1 | $(dirname $0)/colorize.pl 2>&1 +nice make install # no need to use Bochs' own installation mechanism #nice make -j$FAIL_BUILD_PARALLEL bochsinstall diff --git a/src/experiments/checksum-oostubs/CMakeLists.txt b/src/experiments/checksum-oostubs/CMakeLists.txt index e3eb432b..6f41100e 100644 --- a/src/experiments/checksum-oostubs/CMakeLists.txt +++ b/src/experiments/checksum-oostubs/CMakeLists.txt @@ -30,3 +30,4 @@ add_dependencies(${EXPERIMENT_NAME} tracing) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/cool-checksum/CMakeLists.txt b/src/experiments/cool-checksum/CMakeLists.txt index 58572788..7ab8cf08 100644 --- a/src/experiments/cool-checksum/CMakeLists.txt +++ b/src/experiments/cool-checksum/CMakeLists.txt @@ -29,3 +29,4 @@ add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/l4-sys/CMakeLists.txt b/src/experiments/l4-sys/CMakeLists.txt index f7a1f171..3dca273b 100644 --- a/src/experiments/l4-sys/CMakeLists.txt +++ b/src/experiments/l4-sys/CMakeLists.txt @@ -36,3 +36,4 @@ target_link_libraries(${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES}) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/mh-test-campaign/CMakeLists.txt b/src/experiments/mh-test-campaign/CMakeLists.txt index 18ec47ac..7442e03f 100644 --- a/src/experiments/mh-test-campaign/CMakeLists.txt +++ b/src/experiments/mh-test-campaign/CMakeLists.txt @@ -29,3 +29,4 @@ add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server mhcampaign.cc) target_link_libraries(${EXPERIMENT_NAME}-server fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/vezs-example/CMakeLists.txt b/src/experiments/vezs-example/CMakeLists.txt index 5b67b3a9..fbca0b39 100644 --- a/src/experiments/vezs-example/CMakeLists.txt +++ b/src/experiments/vezs-example/CMakeLists.txt @@ -29,3 +29,4 @@ add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) ## This is the example's campaign server distributing experiment parameters #add_executable(${EXPERIMENT_NAME}-server main.cc) #target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +#install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/weather-monitor/CMakeLists.txt b/src/experiments/weather-monitor/CMakeLists.txt index 6458e25b..88b483bb 100644 --- a/src/experiments/weather-monitor/CMakeLists.txt +++ b/src/experiments/weather-monitor/CMakeLists.txt @@ -32,3 +32,4 @@ add_dependencies(${EXPERIMENT_NAME} tracing) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)