diff options
16 files changed, 60 insertions, 60 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 90790de589a..f3d47e876b2 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -72,13 +72,13 @@ if(VALGRIND_EXECUTABLE) set(VALGRIND_COMMAND "${VALGRIND_EXECUTABLE} ${VALGRIND_OPTIONS}") endif() -if(LLVM_VERSION) +if(VESPA_LLVM_VERSION) else() -set (LLVM_VERSION "3.9") +set (VESPA_LLVM_VERSION "3.9") endif() -if(DEFINED BOOST_LIB_SUFFIX) +if(DEFINED VESPA_BOOST_LIB_SUFFIX) else() -set (BOOST_LIB_SUFFIX "-mt-d") +set (VESPA_BOOST_LIB_SUFFIX "-mt-d") endif() if(EXTRA_INCLUDE_DIRECTORY) diff --git a/eval/src/vespa/eval/CMakeLists.txt b/eval/src/vespa/eval/CMakeLists.txt index f0a972aa9b4..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-${LLVM_VERSION} + LLVM-${VESPA_LLVM_VERSION} ) diff --git a/filedistribution/src/apps/filedistributor/CMakeLists.txt b/filedistribution/src/apps/filedistributor/CMakeLists.txt index 9d77550bcb1..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedistributor_app boost boost_filesystem${BOOST_LIB_SUFFIX}) +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 ab924b6d921..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_status-filedistribution_app boost boost_filesystem${BOOST_LIB_SUFFIX}) +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 0af4a139ffd..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_common_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 1c17e96445a..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedbmodelimpl_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 c1ea11c4fb3..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_filedownloader_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 ba4a32b4a50..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_rpc_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 b665dcaa5dc..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_scheduler_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 b352596f87c..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_status_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 291e22dd307..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfacade_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 d4e4139d1e1..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_thread${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_program_options${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_filesystem${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(filedistribution_zkfiledbmodel_test_app boost boost_unit_test_framework${BOOST_LIB_SUFFIX}) +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 af0de61b91c..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${BOOST_LIB_SUFFIX}) +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 c311ab9de1e..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${BOOST_LIB_SUFFIX} - boost_thread${BOOST_LIB_SUFFIX} - boost_filesystem${BOOST_LIB_SUFFIX} + 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 2a997ed2d64..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${BOOST_LIB_SUFFIX}) -vespa_add_target_system_dependency(searchcore_vespa-dump-feed_app boost boost_filesystem${BOOST_LIB_SUFFIX}) +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/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt index c81ad46c86e..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${BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(vespaclient_vespadoclocator_app boost boost_program_options${VESPA_BOOST_LIB_SUFFIX}) |