diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-10 17:53:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 17:53:29 +0200 |
commit | 5dd6c7081cb598b3055c6dc706a3c0417c2998f1 (patch) | |
tree | 302767ac8b20efae3d77dce2b117ee03f40591a6 | |
parent | 3c494c2a4c79730a3e05af68d8a478fbfe0443c1 (diff) | |
parent | 89ac7b5a26370a96ca922e0e2240daa95acc7d46 (diff) |
Merge pull request #7272 from vespa-engine/havardpe/update-fbench-deps
depend on dynamic fastos and vespalib
-rw-r--r-- | fastos/src/vespa/fastos/CMakeLists.txt | 9 | ||||
-rw-r--r-- | fbench/CMakeLists.txt | 4 | ||||
-rw-r--r-- | fbench/src/httpclient/CMakeLists.txt | 2 | ||||
-rw-r--r-- | fbench/src/test/CMakeLists.txt | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/fastos/src/vespa/fastos/CMakeLists.txt b/fastos/src/vespa/fastos/CMakeLists.txt index f98e5b8d97b..b4bb8e47622 100644 --- a/fastos/src/vespa/fastos/CMakeLists.txt +++ b/fastos/src/vespa/fastos/CMakeLists.txt @@ -30,14 +30,5 @@ vespa_add_library(fastos ${CMAKE_DL_LIBS} ) -vespa_add_library(fastos_static STATIC - SOURCES - $<TARGET_OBJECTS:fastos_objects> - INSTALL lib64 - DEPENDS - ${CMAKE_DL_LIBS} -) - find_package(Threads REQUIRED) target_link_libraries(fastos PUBLIC ${CMAKE_THREAD_LIBS_INIT}) -target_link_libraries(fastos_static PUBLIC ${CMAKE_THREAD_LIBS_INIT}) diff --git a/fbench/CMakeLists.txt b/fbench/CMakeLists.txt index bbc8af6b764..bc40e659b99 100644 --- a/fbench/CMakeLists.txt +++ b/fbench/CMakeLists.txt @@ -1,5 +1,9 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_define_module( + DEPENDS + fastos + vespalib + APPS src/fbench src/filterfile diff --git a/fbench/src/httpclient/CMakeLists.txt b/fbench/src/httpclient/CMakeLists.txt index 2260ae47cfd..5f3333128b3 100644 --- a/fbench/src/httpclient/CMakeLists.txt +++ b/fbench/src/httpclient/CMakeLists.txt @@ -3,5 +3,5 @@ vespa_add_library(fbench_httpclient STATIC SOURCES httpclient.cpp DEPENDS - fastos_static + fastos ) diff --git a/fbench/src/test/CMakeLists.txt b/fbench/src/test/CMakeLists.txt index 0bc8e22e276..63d2aa617cf 100644 --- a/fbench/src/test/CMakeLists.txt +++ b/fbench/src/test/CMakeLists.txt @@ -26,6 +26,6 @@ vespa_add_executable(fbench_clientstatus_app TEST clientstatus.cpp DEPENDS fbench_util - fastos_static + fastos ) vespa_add_test(NAME fbench_clientstatus_app COMMAND fbench_clientstatus_app) |