diff options
16 files changed, 65 insertions, 56 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 8c25c22746c..90790de589a 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(LLVM_VERSION) +else() +set (LLVM_VERSION "3.9") +endif() +if(DEFINED BOOST_LIB_SUFFIX) +else() +set (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..f0a972aa9b4 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-${LLVM_VERSION} ) diff --git a/filedistribution/src/apps/filedistributor/CMakeLists.txt b/filedistribution/src/apps/filedistributor/CMakeLists.txt index 33b504cc39f..9d77550bcb1 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${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}) diff --git a/filedistribution/src/apps/status/CMakeLists.txt b/filedistribution/src/apps/status/CMakeLists.txt index 04b3d7cd377..ab924b6d921 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${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_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..0af4a139ffd 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${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_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..1c17e96445a 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${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_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..c1ea11c4fb3 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${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_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..ba4a32b4a50 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${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_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..b665dcaa5dc 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${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_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..b352596f87c 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${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_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..291e22dd307 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${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}) diff --git a/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt b/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt index cf096504294..d4e4139d1e1 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${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_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..af0de61b91c 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${BOOST_LIB_SUFFIX}) diff --git a/filedistribution/src/vespa/filedistribution/manager/CMakeLists.txt b/filedistribution/src/vespa/filedistribution/manager/CMakeLists.txt index 9003deb0abd..c311ab9de1e 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${BOOST_LIB_SUFFIX} + boost_thread${BOOST_LIB_SUFFIX} + boost_filesystem${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..2a997ed2d64 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${BOOST_LIB_SUFFIX}) +vespa_add_target_system_dependency(searchcore_vespa-dump-feed_app boost boost_filesystem${BOOST_LIB_SUFFIX}) diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt index 05794018c5c..c81ad46c86e 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${BOOST_LIB_SUFFIX}) |