diff options
author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-11-02 11:27:21 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-02 12:29:40 +0000 |
commit | fcd144383e8961539d67f4754d8efa3672c77b5d (patch) | |
tree | 2470b3862392f02e5a604b13f8fe6f802ae6e295 /fastos | |
parent | 8e1372f83d9816f1b7bb54307e96cba4dcc13eb3 (diff) |
Only name source once. Fix compile errors.
Diffstat (limited to 'fastos')
-rw-r--r-- | fastos/src/vespa/fastos/CMakeLists.txt | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/fastos/src/vespa/fastos/CMakeLists.txt b/fastos/src/vespa/fastos/CMakeLists.txt index 3d19d37d8e9..8b32d6ed6b6 100644 --- a/fastos/src/vespa/fastos/CMakeLists.txt +++ b/fastos/src/vespa/fastos/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(fastos +vespa_add_library(fastos_objects OBJECT SOURCES app.cpp backtrace.c @@ -21,36 +21,24 @@ vespa_add_library(fastos unix_socket.cpp unix_thread.cpp unix_time.cpp +) + +vespa_add_library(fastos + SOURCES + $<TARGET_OBJECTS:fastos_objects> INSTALL lib64 DEPENDS ${CMAKE_DL_LIBS} ) + vespa_add_library(fastos_static STATIC SOURCES - app.cpp - backtrace.c - file.cpp - linux_file.cpp - serversocket.cpp - socket.cpp - socketevent.cpp - thread.cpp - time.cpp - timestamp.cpp - unix_app.cpp - unix_cond.cpp - unix_dynamiclibrary.cpp - unix_file.cpp - unix_ipc.cpp - unix_mutex.cpp - unix_process.cpp - unix_socket.cpp - unix_thread.cpp - unix_time.cpp + $<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}) |