here-abarany commented on code in PR #3435:
URL: https://github.com/apache/avro/pull/3435#discussion_r2260903313
##########
lang/c++/CMakeLists.txt:
##########
@@ -79,7 +85,7 @@ if (AVRO_BUILD_TESTS OR AVRO_USE_BOOST)
find_package (Boost 1.70 REQUIRED CONFIG COMPONENTS system)
endif ()
-find_package(fmt)
+find_package(fmt QUIET)
Review Comment:
CMake will output a warning if the package isn't found without `QUIET`. I
was hoping to avoid creating a separate PR for such a trivial change, but I
will remove it as I don't want it to hold up this PR.
##########
lang/c++/CMakeLists.txt:
##########
@@ -135,54 +141,53 @@ set (AVRO_SOURCE_FILES
impl/CustomAttributes.cc
)
-add_library (avrocpp SHARED ${AVRO_SOURCE_FILES})
-add_library (avrocpp_s STATIC ${AVRO_SOURCE_FILES})
-
-target_compile_definitions(avrocpp PRIVATE AVRO_SOURCE AVRO_DYN_LINK)
-target_compile_definitions(avrocpp_s PRIVATE AVRO_SOURCE)
-
-set_target_properties (avrocpp PROPERTIES VERSION ${AVRO_VERSION})
-set_target_properties (avrocpp_s PROPERTIES VERSION ${AVRO_VERSION})
-
-target_link_libraries(avrocpp PUBLIC
- $<BUILD_INTERFACE:fmt::fmt-header-only>
- $<BUILD_INTERFACE:ZLIB::ZLIB>
- $<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:Snappy::snappy>>
-
$<$<BOOL:${zstd_FOUND}>:$<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:${ZSTD_TARGET}>>>
- $<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:Boost::system>>
- $<INSTALL_INTERFACE:ZLIB::ZLIB>
- $<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:Snappy::snappy>>
-
$<$<BOOL:${zstd_FOUND}>:$<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:${ZSTD_TARGET}>>>
- $<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:Boost::system>>
-)
-target_link_libraries(avrocpp_s PUBLIC
- $<BUILD_INTERFACE:fmt::fmt-header-only>
- $<BUILD_INTERFACE:ZLIB::ZLIB>
- $<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:Snappy::snappy>>
-
$<$<BOOL:${zstd_FOUND}>:$<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:${ZSTD_TARGET}>>>
- $<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:Boost::system>>
- $<INSTALL_INTERFACE:ZLIB::ZLIB>
- $<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:Snappy::snappy>>
-
$<$<BOOL:${zstd_FOUND}>:$<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:${ZSTD_TARGET}>>>
- $<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:Boost::system>>
-)
+function (setup_avro_lib target lib_type)
+ add_library (${target} ${lib_type} ${AVRO_SOURCE_FILES})
+ target_compile_definitions (${target} PRIVATE AVRO_SOURCE)
+ if (lib_type STREQUAL SHARED)
+ target_compile_definitions (${target} PUBLIC AVRO_DYN_LINK)
+ endif ()
+ set_target_properties (${target} PROPERTIES VERSION ${AVRO_VERSION})
+ target_link_libraries (${target} PUBLIC
+ $<BUILD_INTERFACE:fmt::fmt-header-only>
+ $<BUILD_INTERFACE:ZLIB::ZLIB>
+ $<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:Snappy::snappy>>
+
$<$<BOOL:${zstd_FOUND}>:$<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:${ZSTD_TARGET}>>>
+ $<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:Boost::system>>
+ $<INSTALL_INTERFACE:ZLIB::ZLIB>
+ $<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:Snappy::snappy>>
+
$<$<BOOL:${zstd_FOUND}>:$<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:${ZSTD_TARGET}>>>
+ $<INSTALL_INTERFACE:$<TARGET_NAME_IF_EXISTS:Boost::system>>
+ )
+ target_include_directories (${target} PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:include>
+ )
+endfunction (setup_avro_lib)
-target_include_directories(avrocpp PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:include>
-)
-target_include_directories(avrocpp_s PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:include>
-)
+set (AVRO_INSTALL_LIBS)
+
+if (AVRO_BUILD_SHARED)
+ setup_avro_lib (avrocpp SHARED)
+ list (APPEND AVRO_INSTALL_LIBS avrocpp)
+ set (AVRO_LINK_LIB avrocpp)
+endif ()
+
+if (AVRO_BUILD_STATIC)
+ setup_avro_lib (avrocpp_s STATIC)
+
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
