diff options
| -rw-r--r-- | functions.cmake | 9 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | staging_vespalib/src/tests/benchmark/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vespalog/src/logger/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/allocfree/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/test1/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/test2/CMakeLists.txt | 2 |
10 files changed, 16 insertions, 6 deletions
diff --git a/functions.cmake b/functions.cmake index 4f00da11117..984ec165718 100644 --- a/functions.cmake +++ b/functions.cmake @@ -168,7 +168,7 @@ function(vespa_add_library TARGET) cmake_parse_arguments(ARG "STATIC;OBJECT;INTERFACE;TEST" "INSTALL;OUTPUT_NAME" - "DEPENDS;AFTER;SOURCES" + "DEPENDS;EXTERNAL_DEPENDS;AFTER;SOURCES" ${ARGN}) __check_target_parameters() @@ -233,7 +233,7 @@ function(vespa_add_executable TARGET) cmake_parse_arguments(ARG "TEST" "INSTALL;OUTPUT_NAME" - "DEPENDS;AFTER;SOURCES" + "DEPENDS;EXTERNAL_DEPENDS;AFTER;SOURCES" ${ARGN}) __check_target_parameters() @@ -492,6 +492,11 @@ macro(__add_dependencies_to_target) vespa_add_target_dependency(${TARGET} ${DEPENDEE}) endforeach() + # Link with other external libraries defined as external dependencies + foreach(DEPENDEE IN LISTS ARG_EXTERNAL_DEPENDS) + vespa_add_target_external_dependency(${TARGET} ${DEPENDEE}) + endforeach() + # Link with other external libraries defined as module external dependencies foreach(DEPENDEE IN LISTS MODULE_EXTERNAL_DEPENDS) vespa_add_target_external_dependency(${TARGET} ${DEPENDEE}) diff --git a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt index 4270006e301..31bc8116700 100644 --- a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt @@ -24,6 +24,7 @@ vespa_add_library(searchcore_pcommon STATIC DEPENDS searchcore_proton_metrics searchcore_fconfig + EXTERNAL_DEPENDS ${VESPA_STDCXX_FS_LIB} ) diff --git a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt index 5f9f5528776..9a9b1901c28 100644 --- a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt @@ -122,5 +122,6 @@ vespa_add_library(searchcore_server STATIC searchcore_fconfig searchcore_reference configdefinitions + EXTERNAL_DEPENDS ${VESPA_STDCXX_FS_LIB} ) diff --git a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt index dcc640befc1..5397a453023 100644 --- a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt +++ b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_add_executable(searchlib_ioerrorhandler_test_app TEST DEPENDS searchlib_test searchlib + EXTERNAL_DEPENDS dl ) vespa_add_test(NAME searchlib_ioerrorhandler_test_app COMMAND searchlib_ioerrorhandler_test_app) diff --git a/staging_vespalib/src/tests/benchmark/CMakeLists.txt b/staging_vespalib/src/tests/benchmark/CMakeLists.txt index 92f4f6106c1..cf082d39101 100644 --- a/staging_vespalib/src/tests/benchmark/CMakeLists.txt +++ b/staging_vespalib/src/tests/benchmark/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_add_executable(staging_vespalib_benchmark_test_app testbase.cpp DEPENDS staging_vespalib + EXTERNAL_DEPENDS ${VESPA_GLIBC_RT_LIB} ) vespa_add_test(NAME staging_vespalib_benchmark_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/benchmark_test.sh BENCHMARK diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index e9f2d736b91..dc0a0194d36 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -46,6 +46,7 @@ vespa_define_module( TEST_DEPENDS messagebus_messagebus-test vdstestlib + TEST_EXTERNAL_DEPENDS ${VESPA_ATOMIC_LIB} TESTS diff --git a/vespalog/src/logger/CMakeLists.txt b/vespalog/src/logger/CMakeLists.txt index a9cbf055cd9..b282d60afa9 100644 --- a/vespalog/src/logger/CMakeLists.txt +++ b/vespalog/src/logger/CMakeLists.txt @@ -13,7 +13,7 @@ vespa_add_executable(vespalog_vlogreplay_app logreplay.c OUTPUT_NAME vespa-log-replay INSTALL bin - DEPENDS + EXTERNAL_DEPENDS m ) vespa_add_executable(vespalog_vespa-runserver_app diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt index 34d402d0c60..70e929c95fe 100644 --- a/vespamalloc/src/tests/allocfree/CMakeLists.txt +++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt @@ -19,7 +19,7 @@ vespa_add_executable(vespamalloc_linklist_test_app ../../vespamalloc/malloc/allocchunk.cpp ../../vespamalloc/malloc/common.cpp $<TARGET_OBJECTS:vespamalloc_util> - DEPENDS + EXTERNAL_DEPENDS dl ${VESPA_ATOMIC_LIB} ) diff --git a/vespamalloc/src/tests/test1/CMakeLists.txt b/vespamalloc/src/tests/test1/CMakeLists.txt index 15680f22595..42e168c4736 100644 --- a/vespamalloc/src/tests/test1/CMakeLists.txt +++ b/vespamalloc/src/tests/test1/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(vespamalloc_testatomic_app TEST SOURCES testatomic.cpp - DEPENDS + EXTERNAL_DEPENDS ${VESPA_ATOMIC_LIB} ) vespa_add_test(NAME vespamalloc_testatomic_app NO_VALGRIND COMMAND vespamalloc_testatomic_app) diff --git a/vespamalloc/src/tests/test2/CMakeLists.txt b/vespamalloc/src/tests/test2/CMakeLists.txt index dd4960d8b04..cc4a7fe8ada 100644 --- a/vespamalloc/src/tests/test2/CMakeLists.txt +++ b/vespamalloc/src/tests/test2/CMakeLists.txt @@ -5,7 +5,7 @@ vespa_add_executable(vespamalloc_testgraph_app TEST ../../vespamalloc/util/stream.cpp ../../vespamalloc/util/traceutil.cpp ../../vespamalloc/util/callstack.cpp - DEPENDS + EXTERNAL_DEPENDS dl ) vespa_add_test(NAME vespamalloc_testgraph_app NO_VALGRIND COMMAND vespamalloc_testgraph_app) |