Commit 153fcb56 authored by Dominik Charousset's avatar Dominik Charousset

Fix install paths and remove unnecessary deps

parent 5cbf4873
......@@ -305,12 +305,6 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
COMPONENT core
FILES_MATCHING PATTERN "*.hpp")
# -- add this library to the global CAF_LIBRARIES ------------------------------
list(APPEND CAF_LIBRARIES libcaf_core)
set(CAF_LIBRARIES ${CAF_LIBRARIES} PARENT_SCOPE)
# -- build unit tests ----------------------------------------------------------
if(NOT CAF_NO_UNIT_TESTS)
......@@ -326,10 +320,8 @@ if(NOT CAF_NO_UNIT_TESTS)
${CAF_CORE_TEST_SOURCES})
endif()
# -- backwards compatibility, TODO: remove -------------------------------------
# -- add this library to the global CAF_LIBRARIES ------------------------------
if(BUILD_SHARED_LIBS)
add_library(libcaf_core_shared ALIAS libcaf_core)
else()
add_library(libcaf_core_static ALIAS libcaf_core)
endif()
list(APPEND CAF_LIBRARIES libcaf_core)
set(CAF_LIBRARIES ${CAF_LIBRARIES} PARENT_SCOPE)
......@@ -75,9 +75,7 @@ add_library(libcaf_io $<TARGET_OBJECTS:libcaf_io_obj>)
add_library(caf::io ALIAS libcaf_io)
target_link_libraries(libcaf_io_obj PUBLIC caf::core)
target_link_libraries(libcaf_io PUBLIC caf::core)
target_link_libraries(libcaf_io PUBLIC caf::core ${CAF_EXTRA_LDFLAGS})
generate_export_header(libcaf_io_obj
EXPORT_MACRO_NAME CAF_IO_EXPORT
......@@ -126,11 +124,3 @@ endif()
list(APPEND CAF_LIBRARIES libcaf_io)
set(CAF_LIBRARIES ${CAF_LIBRARIES} PARENT_SCOPE)
# -- backwards compatibility, TODO: remove -------------------------------------
if(BUILD_SHARED_LIBS)
add_library(libcaf_io_shared ALIAS libcaf_io)
else()
add_library(libcaf_io_static ALIAS libcaf_io)
endif()
......@@ -25,9 +25,6 @@ add_library(libcaf_openssl $<TARGET_OBJECTS:libcaf_openssl_obj>)
add_library(caf::openssl ALIAS libcaf_openssl)
target_link_libraries(libcaf_openssl_obj PUBLIC
caf::core caf::io ${OPENSSL_LIBRARIES})
target_link_libraries(libcaf_openssl PUBLIC
caf::core caf::io ${OPENSSL_LIBRARIES})
......@@ -54,7 +51,7 @@ set_target_properties(libcaf_openssl PROPERTIES
# -- install library and header files ------------------------------------------
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/caf/detail/openssl_export.hpp"
install(FILES "${CMAKE_BINARY_DIR}/caf/detail/openssl_export.hpp"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/caf/detail")
install(TARGETS libcaf_openssl
......@@ -89,11 +86,3 @@ endif()
list(APPEND CAF_LIBRARIES libcaf_openssl)
set(CAF_LIBRARIES ${CAF_LIBRARIES} PARENT_SCOPE)
# -- backwards compatibility, TODO: remove -------------------------------------
if(BUILD_SHARED_LIBS)
add_library(libcaf_openssl_shared ALIAS libcaf_openssl)
else()
add_library(libcaf_openssl_static ALIAS libcaf_openssl)
endif()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment