AVRO-4015: [C++] fixed the c++ build to facilitate using it with Fetc…

…hContent (#3008) - exposed the include libraries in such a way that they can be accessed - added the necessary libs to the static target Co-authored-by: Michael Bailey <[email protected]>
apache · Jul 10, 2024 · 8281e61 · 8281e61
1 parent d0d8003
commit 8281e61
Show file tree

Hide file tree

Showing 40 changed files with 14 additions and 5 deletions.
diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
@@ -108,7 +108,7 @@ add_definitions (${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
 
 add_definitions (-DAVRO_VERSION="${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}")
 
-include_directories (api ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS})
+include_directories (include/avro ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS})
 
 set (AVRO_SOURCE_FILES
         impl/Compiler.cc impl/Node.cc impl/LogicalType.cc
@@ -135,7 +135,7 @@ set_property (TARGET avrocpp
 
 add_library (avrocpp_s STATIC ${AVRO_SOURCE_FILES})
 target_include_directories(avrocpp_s PRIVATE ${SNAPPY_INCLUDE_DIR})
-target_link_libraries(avrocpp_s fmt::fmt-header-only)
+target_link_libraries(avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} fmt::fmt-header-only)
 
 set_property (TARGET avrocpp avrocpp_s
     APPEND PROPERTY COMPILE_DEFINITIONS AVRO_SOURCE)
@@ -151,7 +151,7 @@ target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
 
 add_executable (precompile test/precompile.cc)
 
-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
+target_link_libraries (precompile avrocpp_s)
 
 macro (gen file ns)
     add_custom_command (OUTPUT ${file}.hh
@@ -183,7 +183,16 @@ gen (cpp_reserved_words cppres)
 gen (cpp_reserved_words_union_typedef cppres_union)
 
 add_executable (avrogencpp impl/avrogencpp.cc)
-target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
+target_link_libraries (avrogencpp avrocpp_s)
+
+target_include_directories(avrocpp_s PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>
+)
+target_include_directories(avrocpp PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>
+)
 
 enable_testing()
 
@@ -230,7 +239,7 @@ install (TARGETS avrocpp avrocpp_s
 
 install (TARGETS avrogencpp RUNTIME DESTINATION bin)
 
-install (DIRECTORY api/ DESTINATION include/avro
+install (DIRECTORY include/avro DESTINATION include
     FILES_MATCHING PATTERN *.hh)
 
 if (NOT CMAKE_BUILD_TYPE)

diff --git a/lang/c++/api/AvroParse.hh → lang/c++/include/avro/AvroParse.hh b/lang/c++/api/AvroParse.hh → lang/c++/include/avro/AvroParse.hh
diff --git a/lang/c++/api/AvroSerialize.hh → lang/c++/include/avro/AvroSerialize.hh b/lang/c++/api/AvroSerialize.hh → lang/c++/include/avro/AvroSerialize.hh
diff --git a/lang/c++/api/AvroTraits.hh → lang/c++/include/avro/AvroTraits.hh b/lang/c++/api/AvroTraits.hh → lang/c++/include/avro/AvroTraits.hh
diff --git a/lang/c++/api/Compiler.hh → lang/c++/include/avro/Compiler.hh b/lang/c++/api/Compiler.hh → lang/c++/include/avro/Compiler.hh
diff --git a/lang/c++/api/Config.hh → lang/c++/include/avro/Config.hh b/lang/c++/api/Config.hh → lang/c++/include/avro/Config.hh
diff --git a/lang/c++/api/CustomAttributes.hh → lang/c++/include/avro/CustomAttributes.hh b/lang/c++/api/CustomAttributes.hh → lang/c++/include/avro/CustomAttributes.hh
diff --git a/lang/c++/api/DataFile.hh → lang/c++/include/avro/DataFile.hh b/lang/c++/api/DataFile.hh → lang/c++/include/avro/DataFile.hh
diff --git a/lang/c++/api/Decoder.hh → lang/c++/include/avro/Decoder.hh b/lang/c++/api/Decoder.hh → lang/c++/include/avro/Decoder.hh
diff --git a/lang/c++/api/Encoder.hh → lang/c++/include/avro/Encoder.hh b/lang/c++/api/Encoder.hh → lang/c++/include/avro/Encoder.hh
diff --git a/lang/c++/api/Exception.hh → lang/c++/include/avro/Exception.hh b/lang/c++/api/Exception.hh → lang/c++/include/avro/Exception.hh
diff --git a/lang/c++/api/Generic.hh → lang/c++/include/avro/Generic.hh b/lang/c++/api/Generic.hh → lang/c++/include/avro/Generic.hh
diff --git a/lang/c++/api/GenericDatum.hh → lang/c++/include/avro/GenericDatum.hh b/lang/c++/api/GenericDatum.hh → lang/c++/include/avro/GenericDatum.hh
diff --git a/lang/c++/api/Layout.hh → lang/c++/include/avro/Layout.hh b/lang/c++/api/Layout.hh → lang/c++/include/avro/Layout.hh
diff --git a/lang/c++/api/LogicalType.hh → lang/c++/include/avro/LogicalType.hh b/lang/c++/api/LogicalType.hh → lang/c++/include/avro/LogicalType.hh
diff --git a/lang/c++/api/Node.hh → lang/c++/include/avro/Node.hh b/lang/c++/api/Node.hh → lang/c++/include/avro/Node.hh
diff --git a/lang/c++/api/NodeConcepts.hh → lang/c++/include/avro/NodeConcepts.hh b/lang/c++/api/NodeConcepts.hh → lang/c++/include/avro/NodeConcepts.hh
diff --git a/lang/c++/api/NodeImpl.hh → lang/c++/include/avro/NodeImpl.hh b/lang/c++/api/NodeImpl.hh → lang/c++/include/avro/NodeImpl.hh
diff --git a/lang/c++/api/Parser.hh → lang/c++/include/avro/Parser.hh b/lang/c++/api/Parser.hh → lang/c++/include/avro/Parser.hh
diff --git a/lang/c++/api/Reader.hh → lang/c++/include/avro/Reader.hh b/lang/c++/api/Reader.hh → lang/c++/include/avro/Reader.hh
diff --git a/lang/c++/api/Resolver.hh → lang/c++/include/avro/Resolver.hh b/lang/c++/api/Resolver.hh → lang/c++/include/avro/Resolver.hh
diff --git a/lang/c++/api/ResolverSchema.hh → lang/c++/include/avro/ResolverSchema.hh b/lang/c++/api/ResolverSchema.hh → lang/c++/include/avro/ResolverSchema.hh
diff --git a/lang/c++/api/ResolvingReader.hh → lang/c++/include/avro/ResolvingReader.hh b/lang/c++/api/ResolvingReader.hh → lang/c++/include/avro/ResolvingReader.hh
diff --git a/lang/c++/api/Schema.hh → lang/c++/include/avro/Schema.hh b/lang/c++/api/Schema.hh → lang/c++/include/avro/Schema.hh
diff --git a/lang/c++/api/SchemaResolution.hh → lang/c++/include/avro/SchemaResolution.hh b/lang/c++/api/SchemaResolution.hh → lang/c++/include/avro/SchemaResolution.hh
diff --git a/lang/c++/api/Serializer.hh → lang/c++/include/avro/Serializer.hh b/lang/c++/api/Serializer.hh → lang/c++/include/avro/Serializer.hh
diff --git a/lang/c++/api/Specific.hh → lang/c++/include/avro/Specific.hh b/lang/c++/api/Specific.hh → lang/c++/include/avro/Specific.hh
diff --git a/lang/c++/api/Stream.hh → lang/c++/include/avro/Stream.hh b/lang/c++/api/Stream.hh → lang/c++/include/avro/Stream.hh
diff --git a/lang/c++/api/Types.hh → lang/c++/include/avro/Types.hh b/lang/c++/api/Types.hh → lang/c++/include/avro/Types.hh
diff --git a/lang/c++/api/ValidSchema.hh → lang/c++/include/avro/ValidSchema.hh b/lang/c++/api/ValidSchema.hh → lang/c++/include/avro/ValidSchema.hh
diff --git a/lang/c++/api/Validator.hh → lang/c++/include/avro/Validator.hh b/lang/c++/api/Validator.hh → lang/c++/include/avro/Validator.hh
diff --git a/lang/c++/api/Writer.hh → lang/c++/include/avro/Writer.hh b/lang/c++/api/Writer.hh → lang/c++/include/avro/Writer.hh
diff --git a/lang/c++/api/Zigzag.hh → lang/c++/include/avro/Zigzag.hh b/lang/c++/api/Zigzag.hh → lang/c++/include/avro/Zigzag.hh
diff --git a/lang/c++/api/buffer/Buffer.hh → lang/c++/include/avro/buffer/Buffer.hh b/lang/c++/api/buffer/Buffer.hh → lang/c++/include/avro/buffer/Buffer.hh
diff --git a/lang/c++/api/buffer/BufferPrint.hh → lang/c++/include/avro/buffer/BufferPrint.hh b/lang/c++/api/buffer/BufferPrint.hh → lang/c++/include/avro/buffer/BufferPrint.hh
diff --git a/lang/c++/api/buffer/BufferReader.hh → lang/c++/include/avro/buffer/BufferReader.hh b/lang/c++/api/buffer/BufferReader.hh → lang/c++/include/avro/buffer/BufferReader.hh
diff --git a/lang/c++/api/buffer/BufferStream.hh → lang/c++/include/avro/buffer/BufferStream.hh b/lang/c++/api/buffer/BufferStream.hh → lang/c++/include/avro/buffer/BufferStream.hh
diff --git a/lang/c++/api/buffer/BufferStreambuf.hh → ...++/include/avro/buffer/BufferStreambuf.hh b/lang/c++/api/buffer/BufferStreambuf.hh → ...++/include/avro/buffer/BufferStreambuf.hh
diff --git a/lang/c++/api/buffer/detail/BufferDetail.hh → ...nclude/avro/buffer/detail/BufferDetail.hh b/lang/c++/api/buffer/detail/BufferDetail.hh → ...nclude/avro/buffer/detail/BufferDetail.hh
diff --git a/...api/buffer/detail/BufferDetailIterator.hh → ...vro/buffer/detail/BufferDetailIterator.hh b/...api/buffer/detail/BufferDetailIterator.hh → ...vro/buffer/detail/BufferDetailIterator.hh