diff options
author | Arnstein Ressem <aressem@gmail.com> | 2017-08-11 08:29:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-11 08:29:01 +0200 |
commit | 8e2b32c28708a2989341797c722f68b07d847c3d (patch) | |
tree | 05720d3ffb9bc5b0a9dd9c43a029cd04b201d65a | |
parent | 71983f66ff47881fa8ab4704669d565793835b43 (diff) | |
parent | 2fc16a25d8e8debf70d31530e3e64b210f0c8358 (diff) |
Merge pull request #3069 from vespa-engine/toregge/allow-other-boost-and-llvm-versions
Toregge/allow other boost and llvm versions
17 files changed, 65 insertions, 136 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 8c25c22746c..f3d47e876b2 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -72,6 +72,15 @@ if(VALGRIND_EXECUTABLE) set(VALGRIND_COMMAND "${VALGRIND_EXECUTABLE} ${VALGRIND_OPTIONS}") endif() +if(VESPA_LLVM_VERSION) +else() +set (VESPA_LLVM_VERSION "3.9") +endif() +if(DEFINED VESPA_BOOST_LIB_SUFFIX) +else() +set (VESPA_BOOST_LIB_SUFFIX "-mt-d") +endif() + if(EXTRA_INCLUDE_DIRECTORY) include_directories(SYSTEM ${EXTRA_INCLUDE_DIRECTORY}) endif() diff --git a/eval/src/vespa/eval/CMakeLists.txt b/eval/src/vespa/eval/CMakeLists.txt index 0a46b498b80..8a2cf16bf87 100644 --- a/eval/src/vespa/eval/CMakeLists.txt +++ b/eval/src/vespa/eval/CMakeLists.txt @@ -11,5 +11,5 @@ vespa_add_library(vespaeval $<TARGET_OBJECTS:eval_tensor_serialization> INSTALL lib64 DEPENDS - LLVM-3.9 + LLVM-${VESPA_LLVM_VERSION} ) diff --git a/filedistribution/src/apps/filedistributor/CMakeLists.txt b/filedistribution/src/apps/filedistributor/CMakeLists.txt index 33b504cc39f..22ffcddcd6f 100644 --- a/filedistribution/src/apps/filedistributor/CMakeLists.txt +++ b/filedistribution/src/apps/filedistributor/CMakeLists.txt @@ -11,7 +11,7 @@ vespa_add_executable(filedistribution_filedistributor_app filedistribution_common ) target_compile_options(filedistribution_filedistributor_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_filesystem-mt-d) +vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) diff --git a/filedistribution/src/apps/status/CMakeLists.txt b/filedistribution/src/apps/status/CMakeLists.txt index 04b3d7cd377..e666bc2cecc 100644 --- a/filedistribution/src/apps/status/CMakeLists.txt +++ b/filedistribution/src/apps/status/CMakeLists.txt @@ -9,8 +9,8 @@ vespa_add_executable(filedistribution_status-filedistribution_app filedistribution_common ) target_compile_options(filedistribution_status-filedistribution_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_filesystem-mt-d) +vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) vespa_install_script(vespa-status-filedistribution.sh vespa-status-filedistribution bin) diff --git a/filedistribution/src/tests/common/CMakeLists.txt b/filedistribution/src/tests/common/CMakeLists.txt index 39c9971fa41..9f142eec9e7 100644 --- a/filedistribution/src/tests/common/CMakeLists.txt +++ b/filedistribution/src/tests/common/CMakeLists.txt @@ -5,9 +5,9 @@ vespa_add_executable(filedistribution_common_test_app TEST DEPENDS ) target_compile_options(filedistribution_common_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) vespa_add_test(NAME filedistribution_common_test_app NO_VALGRIND COMMAND filedistribution_common_test_app) diff --git a/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt b/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt index 1f54a4a84ca..a97cc9e4c7a 100644 --- a/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt +++ b/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt @@ -8,9 +8,9 @@ vespa_add_executable(filedistribution_filedbmodelimpl_test_app TEST filedistribution_mocks ) target_compile_options(filedistribution_filedbmodelimpl_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) vespa_add_test(NAME filedistribution_filedbmodelimpl_test_app NO_VALGRIND COMMAND filedistribution_filedbmodelimpl_test_app) diff --git a/filedistribution/src/tests/filedownloader/CMakeLists.txt b/filedistribution/src/tests/filedownloader/CMakeLists.txt index 89efcaee7b6..7bdfeda3525 100644 --- a/filedistribution/src/tests/filedownloader/CMakeLists.txt +++ b/filedistribution/src/tests/filedownloader/CMakeLists.txt @@ -7,9 +7,9 @@ vespa_add_executable(filedistribution_filedownloader_test_app TEST filedistribution_common ) target_compile_options(filedistribution_filedownloader_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) vespa_add_test(NAME filedistribution_filedownloader_test_app NO_VALGRIND COMMAND filedistribution_filedownloader_test_app) diff --git a/filedistribution/src/tests/rpc/CMakeLists.txt b/filedistribution/src/tests/rpc/CMakeLists.txt index 61600d1ba66..1882959f94f 100644 --- a/filedistribution/src/tests/rpc/CMakeLists.txt +++ b/filedistribution/src/tests/rpc/CMakeLists.txt @@ -7,9 +7,9 @@ vespa_add_executable(filedistribution_rpc_test_app TEST filedistribution_common ) target_compile_options(filedistribution_rpc_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) vespa_add_test(NAME filedistribution_rpc_test_app NO_VALGRIND COMMAND filedistribution_rpc_test_app) diff --git a/filedistribution/src/tests/scheduler/CMakeLists.txt b/filedistribution/src/tests/scheduler/CMakeLists.txt index e7108a6c636..763d87cfc64 100644 --- a/filedistribution/src/tests/scheduler/CMakeLists.txt +++ b/filedistribution/src/tests/scheduler/CMakeLists.txt @@ -8,9 +8,9 @@ vespa_add_executable(filedistribution_scheduler_test_app TEST filedistribution_common ) target_compile_options(filedistribution_scheduler_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) vespa_add_test(NAME filedistribution_scheduler_test_app NO_VALGRIND COMMAND filedistribution_scheduler_test_app) diff --git a/filedistribution/src/tests/status/CMakeLists.txt b/filedistribution/src/tests/status/CMakeLists.txt index 0bc1489c1cd..646cc1351a9 100644 --- a/filedistribution/src/tests/status/CMakeLists.txt +++ b/filedistribution/src/tests/status/CMakeLists.txt @@ -7,9 +7,9 @@ vespa_add_executable(filedistribution_status_test_app TEST filedistribution_common ) target_compile_options(filedistribution_status_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) vespa_add_test(NAME filedistribution_status_test_app NO_VALGRIND COMMAND filedistribution_status_test_app) diff --git a/filedistribution/src/tests/zkfacade/CMakeLists.txt b/filedistribution/src/tests/zkfacade/CMakeLists.txt index 2ca3efb49e7..18dc8121049 100644 --- a/filedistribution/src/tests/zkfacade/CMakeLists.txt +++ b/filedistribution/src/tests/zkfacade/CMakeLists.txt @@ -8,8 +8,8 @@ vespa_add_executable(filedistribution_zkfacade_test_app filedistribution_mocks ) target_compile_options(filedistribution_zkfacade_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) diff --git a/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt b/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt index cf096504294..e21d0bacf6e 100644 --- a/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt +++ b/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt @@ -8,9 +8,9 @@ vespa_add_executable(filedistribution_zkfiledbmodel_test_app TEST filedistribution_mocks ) target_compile_options(filedistribution_zkfiledbmodel_test_app PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_thread-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_program_options-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_filesystem-mt-d) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_unit_test_framework-mt-d) +vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_unit_test_framework${VESPA_BOOST_LIB_SUFFIX}) vespa_add_test(NAME filedistribution_zkfiledbmodel_test_app NO_VALGRIND COMMAND filedistribution_zkfiledbmodel_test_app) diff --git a/filedistribution/src/vespa/filedistribution/common/CMakeLists.txt b/filedistribution/src/vespa/filedistribution/common/CMakeLists.txt index 700fae7ad5f..129b084b400 100644 --- a/filedistribution/src/vespa/filedistribution/common/CMakeLists.txt +++ b/filedistribution/src/vespa/filedistribution/common/CMakeLists.txt @@ -12,4 +12,4 @@ vespa_add_library(filedistribution_common STATIC DEPENDS ) target_compile_options(filedistribution_common PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) -vespa_add_target_system_dependency(filedistribution_common boost boost_thread-mt-d) +vespa_add_target_system_dependency(filedistribution_common boost boost_thread${VESPA_BOOST_LIB_SUFFIX}) diff --git a/filedistribution/src/vespa/filedistribution/manager/CMakeLists.txt b/filedistribution/src/vespa/filedistribution/manager/CMakeLists.txt index 9003deb0abd..049a61f7367 100644 --- a/filedistribution/src/vespa/filedistribution/manager/CMakeLists.txt +++ b/filedistribution/src/vespa/filedistribution/manager/CMakeLists.txt @@ -11,9 +11,9 @@ vespa_add_library(filedistribution_filedistributionmanager INSTALL lib64 OUTPUT_NAME filedistributionmanager DEPENDS - boost_system-mt-d - boost_thread-mt-d - boost_filesystem-mt-d + boost_system${VESPA_BOOST_LIB_SUFFIX} + boost_thread${VESPA_BOOST_LIB_SUFFIX} + boost_filesystem${VESPA_BOOST_LIB_SUFFIX} zookeeper_mt ${JAVA_JVM_LIBRARY} ) diff --git a/searchcore/src/apps/vespa-dump-feed/CMakeLists.txt b/searchcore/src/apps/vespa-dump-feed/CMakeLists.txt index 6f0773a9927..df2022f2e70 100644 --- a/searchcore/src/apps/vespa-dump-feed/CMakeLists.txt +++ b/searchcore/src/apps/vespa-dump-feed/CMakeLists.txt @@ -4,5 +4,5 @@ vespa_add_executable(searchcore_vespa-dump-feed_app vespa-dump-feed.cpp DEPENDS ) -vespa_add_target_system_dependency(searchcore_vespa-dump-feed_app boost boost_system-mt-d) -vespa_add_target_system_dependency(searchcore_vespa-dump-feed_app boost boost_filesystem-mt-d) +vespa_add_target_system_dependency(searchcore_vespa-dump-feed_app boost boost_system${VESPA_BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(searchcore_vespa-dump-feed_app boost boost_filesystem${VESPA_BOOST_LIB_SUFFIX}) diff --git a/storage/src/tests/fastos.project.newcore b/storage/src/tests/fastos.project.newcore deleted file mode 100644 index 7b5cad846b1..00000000000 --- a/storage/src/tests/fastos.project.newcore +++ /dev/null @@ -1,80 +0,0 @@ -APPLICATION testrunner -OBJS storageserver/dummystoragelink -OBJS testrunner testhelper -LIBS tests/persistence/memfile/testmemfiletop -LIBS tests/serverapp/testserverapp -LIBS tests/storageserver/teststorageserver -LIBS tests/bucketmover/testbucketmover -LIBS tests/storageutil/teststorageutil -LIBS tests/visiting/testvisiting -LIBS tests/bucketdb/testbucketdb -LIBS tests/common/testcommon -LIBS tests/common/hostreporter/testhostreporter -LIBS tests/distributor/testdistributor -LIBS tests/persistence/testpersistence -LIBS tests/persistence/device/testdevice -LIBS tests/persistence/filestorage/testfilestorage -LIBS tests/persistence/filestorage/slotfile/testslotfile -LIBS tests/splitting/testsplitting -LIBS tests/memorymanager/testmemorymanager - -LIBS storage/storageserver/storageserver -LIBS storage/bucketmover/bucketmover -LIBS storage/visiting/visitor -LIBS storage/memorymanager/memorymanager -LIBS storage/persistence/persistence -LIBS storage/persistence/filestorage/filestorpersistence -LIBS storage/persistence/memfile/memfiletop -LIBS storage/persistence/memfile/common/memfilecommon -LIBS storage/persistence/memfile/mapper/memfilemapper -LIBS storage/persistence/memfile/handler/memfilehandler -LIBS storage/persistence/memfile/memfile/memfile -LIBS storage/persistence/memfile/common/memfilecommon -LIBS storage/persistence/memfile/memfiletop -LIBS storage/storageutil/storageutil -LIBS storage/persistence/device/device -LIBS storage/persistence/filestorage/slotfile/slotfile -LIBS storage/bucketdb/bucketdb -LIBS storage/distributor/distributor -LIBS storage/common/common -LIBS storage/config/storageconfig -EXTERNALLIBS cppunit vdslib storageapi -EXTERNALLIBS document metrics boost_regex-mt-d -EXTERNALLIBS fast iconv -EXTERNALLIBS vespa -EXTERNALLIBS config vespalog Judy vdslib documentapi vespalib -EXTERNALLIBS messagebus-test slobrokserver - -CUSTOMMAKE - -LIBDIR_TESTS=persistence/memfile:bucketdb:common:distributor:persistence:persistence/device:persistence/filestorage:persistence/filestorage/slotfile:serverapp:storageserver:storageutil:visiting:splitting:memorymanager:bucketmover - -test: all - rm -f test.vlog - VESPA_LOG_TARGET=file:test.vlog LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) $(VALGRIND) ./testrunner --verbose $(TESTRUNARGS) - -vtest: all - rm -f test.vlog - VESPA_LOG_TARGET=file:test.vlog LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) valgrind --leak-check=no ./testrunner --verbose - -testdebug: all - rm -f test.vlog - VESPA_LOG_TARGET=file:test.vlog LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) gdb53 ./testrunner --verbose - -testwithlog: all - LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) ./testrunner --verbose - -vtestwithlog: all - LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) valgrind ./testrunner --verbose - -stresstest: all - rm -f test.vlog - VESPA_LOG_TARGET=file:test.vlog LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) ./testrunner --verbose --includestress stress Stress - -testverbose: all - rm -f test.vlog - VESPA_LOG_TARGET=file:test.vlog LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) ./testrunner --verbose - -testall: all - rm -f test.vlog - VESPA_LOG_TARGET=file:test.vlog LD_LIBRARY_PATH=$(LIBDIR_BOOST_REGEX-MT-D):$(LIBDIR_DSTORE):$(LIBDIR_ICONV):$(LIBDIR_CPPUNIT):$(LIBDIR_TESTS):$(LD_LIBRARY_PATH) $(VALGRIND) ./testrunner --verbose --includestress diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt index 05794018c5c..69bffc28092 100644 --- a/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt +++ b/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt @@ -8,4 +8,4 @@ vespa_add_executable(vespaclient_vespadoclocator_app INSTALL bin DEPENDS ) -vespa_add_target_system_dependency(vespaclient_vespadoclocator_app boost boost_program_options-mt-d) +vespa_add_target_system_dependency(vespaclient_vespadoclocator_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) |