This is an automated email from the ASF dual-hosted git repository.
thiru pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/main by this push:
new 30b39e91b add two cmake options to make it easier to integrate avro
c++ (#3268)
30b39e91b is described below
commit 30b39e91bd1bac88c94c1914d4d8d55c53a395f5
Author: Junwang Zhao <[email protected]>
AuthorDate: Sun Dec 22 20:45:00 2024 +0800
add two cmake options to make it easier to integrate avro c++ (#3268)
AVRO_BUILD_EXECUTABLES controls whether to build precompile and avrogencpp
AVRO_BUILD_TESTS controls whether to build unittest
The two options default to ON conforming the original behaviour.
This is needed because for libraries like iceberg-cpp, we don't need
to build the unittest and executable.
Signed-off-by: Junwang Zhao <[email protected]>
---
lang/c++/CMakeLists.txt | 166 ++++++++++++++++++++++++++----------------------
1 file changed, 89 insertions(+), 77 deletions(-)
diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
index 613d17c2b..e6f70bffd 100644
--- a/lang/c++/CMakeLists.txt
+++ b/lang/c++/CMakeLists.txt
@@ -55,6 +55,9 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
project (Avro-cpp)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
+option(AVRO_BUILD_EXECUTABLES "Build executables" ON)
+option(AVRO_BUILD_TESTS "Build tests" ON)
+
if (WIN32 AND NOT CYGWIN AND NOT MSYS)
add_definitions (/EHa)
add_definitions (
@@ -78,9 +81,12 @@ if (AVRO_ADD_PROTECTOR_FLAGS)
endif ()
endif ()
-
-find_package (Boost 1.38 REQUIRED
- COMPONENTS filesystem iostreams program_options regex system)
+if (AVRO_BUILD_TESTS OR AVRO_BUILD_EXECUTABLES)
+ find_package (Boost 1.38 REQUIRED
+ COMPONENTS filesystem iostreams program_options system)
+else ()
+ find_package (Boost 1.38 REQUIRED COMPONENTS iostreams)
+endif ()
include(FetchContent)
FetchContent_Declare(
@@ -149,86 +155,90 @@ set_target_properties (avrocpp_s PROPERTIES
target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}
fmt::fmt-header-only)
target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
-add_executable (precompile test/precompile.cc)
-
-target_link_libraries (precompile avrocpp_s)
-
-macro (gen file ns)
- add_custom_command (OUTPUT ${file}.hh
- COMMAND avrogencpp
- -p -
- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}
- -o ${file}.hh -n ${ns}
- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file})
- add_custom_target (${file}_hh DEPENDS ${file}.hh)
-endmacro (gen)
-
-gen (empty_record empty)
-gen (bigrecord testgen)
-gen (bigrecord_r testgen_r)
-gen (bigrecord2 testgen2)
-gen (tweet testgen3)
-gen (union_array_union uau)
-gen (union_map_union umu)
-gen (union_conflict uc)
-gen (union_empty_record uer)
-gen (recursive rec)
-gen (reuse ru)
-gen (circulardep cd)
-gen (tree1 tr1)
-gen (tree2 tr2)
-gen (crossref cr)
-gen (primitivetypes pt)
-gen (cpp_reserved_words cppres)
-gen (cpp_reserved_words_union_typedef cppres_union)
-gen (big_union big_union)
-gen (union_redundant_types redundant_types)
-
-add_executable (avrogencpp impl/avrogencpp.cc)
-target_link_libraries (avrogencpp avrocpp_s)
-
-target_include_directories(avrocpp_s PUBLIC
+target_include_directories(avrocpp PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
-target_include_directories(avrocpp PUBLIC
+target_include_directories(avrocpp_s PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
-enable_testing()
-
-macro (unittest name)
- add_executable (${name} test/${name}.cc)
- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES}
${SNAPPY_LIBRARIES})
- add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
-endmacro (unittest)
-
-unittest (buffertest)
-unittest (unittest)
-unittest (SchemaTests)
-unittest (LargeSchemaTests)
-unittest (CodecTests)
-unittest (StreamTests)
-unittest (SpecificTests)
-unittest (DataFileTests)
-unittest (JsonTests)
-unittest (AvrogencppTests)
-unittest (CompilerTests)
-unittest (AvrogencppTestReservedWords)
-unittest (CommonsSchemasTests)
-
-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh
- cpp_reserved_words_union_typedef_hh)
-
-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
- tweet_hh
- union_array_union_hh union_map_union_hh union_conflict_hh
- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
- primitivetypes_hh empty_record_hh cpp_reserved_words_union_typedef_hh
- union_empty_record_hh big_union_hh union_redundant_types_hh)
+if (AVRO_BUILD_EXECUTABLES)
+ add_executable (precompile test/precompile.cc)
+
+ target_link_libraries (precompile avrocpp_s)
+
+ macro (gen file ns)
+ add_custom_command (OUTPUT ${file}.hh
+ COMMAND avrogencpp
+ -p -
+ -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}
+ -o ${file}.hh -n ${ns}
+ DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file})
+ add_custom_target (${file}_hh DEPENDS ${file}.hh)
+ endmacro (gen)
+
+ gen (empty_record empty)
+ gen (bigrecord testgen)
+ gen (bigrecord_r testgen_r)
+ gen (bigrecord2 testgen2)
+ gen (tweet testgen3)
+ gen (union_array_union uau)
+ gen (union_map_union umu)
+ gen (union_conflict uc)
+ gen (union_empty_record uer)
+ gen (recursive rec)
+ gen (reuse ru)
+ gen (circulardep cd)
+ gen (tree1 tr1)
+ gen (tree2 tr2)
+ gen (crossref cr)
+ gen (primitivetypes pt)
+ gen (cpp_reserved_words cppres)
+ gen (cpp_reserved_words_union_typedef cppres_union)
+ gen (big_union big_union)
+ gen (union_redundant_types redundant_types)
+
+ add_executable (avrogencpp impl/avrogencpp.cc)
+ target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES})
+endif ()
+
+if (AVRO_BUILD_TESTS)
+ enable_testing()
+
+ macro (unittest name)
+ add_executable (${name} test/${name}.cc)
+ target_link_libraries (${name} avrocpp_s ${Boost_LIBRARIES}
${SNAPPY_LIBRARIES})
+ add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
+ endmacro (unittest)
+
+ unittest (buffertest)
+ unittest (unittest)
+ unittest (SchemaTests)
+ unittest (LargeSchemaTests)
+ unittest (CodecTests)
+ unittest (StreamTests)
+ unittest (SpecificTests)
+ unittest (DataFileTests)
+ unittest (JsonTests)
+ unittest (AvrogencppTests)
+ unittest (CompilerTests)
+ unittest (AvrogencppTestReservedWords)
+ unittest (CommonsSchemasTests)
+
+ add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
+ add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh
+ cpp_reserved_words_union_typedef_hh)
+
+ add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
+ tweet_hh
+ union_array_union_hh union_map_union_hh union_conflict_hh
+ recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
+ primitivetypes_hh empty_record_hh cpp_reserved_words_union_typedef_hh
+ union_empty_record_hh big_union_hh union_redundant_types_hh)
+endif ()
include (InstallRequiredSystemLibraries)
@@ -241,7 +251,9 @@ install (TARGETS avrocpp avrocpp_s
ARCHIVE DESTINATION lib
RUNTIME DESTINATION lib)
-install (TARGETS avrogencpp RUNTIME DESTINATION bin)
+if (AVRO_BUILD_EXECUTABLES)
+ install (TARGETS avrogencpp RUNTIME DESTINATION bin)
+endif ()
install (DIRECTORY include/avro DESTINATION include
FILES_MATCHING PATTERN *.hh)
