Commit 11dd2cf0 authored by Dominik Charousset's avatar Dominik Charousset

Fix build on Linux

parent 97cf0d51
...@@ -101,6 +101,7 @@ if(CAF_INC_ENABLE_UTILITY_TARGETS) ...@@ -101,6 +101,7 @@ if(CAF_INC_ENABLE_UTILITY_TARGETS)
add_executable(caf-generate-enum-strings add_executable(caf-generate-enum-strings
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
cmake/caf-generate-enum-strings.cpp) cmake/caf-generate-enum-strings.cpp)
set_property(TARGET caf-generate-enum-strings PROPERTY CXX_STANDARD 17)
add_custom_target(consistency-check) add_custom_target(consistency-check)
add_custom_target(update-enum-strings) add_custom_target(update-enum-strings)
# adds a consistency check that verifies that `cpp_file` is still valid by # adds a consistency check that verifies that `cpp_file` is still valid by
...@@ -145,11 +146,6 @@ function(caf_incubator_export_and_install_lib component) ...@@ -145,11 +146,6 @@ function(caf_incubator_export_and_install_lib component)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
set_target_properties(libcaf_${component} PROPERTIES
EXPORT_NAME ${component}
SOVERSION ${CAF_VERSION}
VERSION ${CAF_INC_LIB_VERSION}
OUTPUT_NAME caf_${component})
install(TARGETS libcaf_${component} install(TARGETS libcaf_${component}
EXPORT CAFIncubatorTargets EXPORT CAFIncubatorTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${component} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${component}
...@@ -161,6 +157,11 @@ function(caf_incubator_export_and_install_lib component) ...@@ -161,6 +157,11 @@ function(caf_incubator_export_and_install_lib component)
FILES_MATCHING PATTERN "*.hpp") FILES_MATCHING PATTERN "*.hpp")
get_target_property(lib_type libcaf_${component} TYPE) get_target_property(lib_type libcaf_${component} TYPE)
if(NOT lib_type STREQUAL "INTERFACE_LIBRARY") if(NOT lib_type STREQUAL "INTERFACE_LIBRARY")
set_target_properties(libcaf_${component} PROPERTIES
EXPORT_NAME ${component}
SOVERSION ${CAF_VERSION}
VERSION ${CAF_INC_LIB_VERSION}
OUTPUT_NAME caf_${component})
string(TOUPPER "CAF_${component}_EXPORT" export_macro_name) string(TOUPPER "CAF_${component}_EXPORT" export_macro_name)
generate_export_header( generate_export_header(
libcaf_${component} libcaf_${component}
......
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