wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move rapidxml to its own target

This commit is contained in:
Markus Pilman 2022-06-29 16:10:14 -06:00
parent 364644673f
commit 8123070c2a
10 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/CMakeLists.txt
View File

@ -4,6 +4,7 @@ target_include_directories(rapidjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/rapid
add_subdirectory(crc32) add_subdirectory(crc32)
add_subdirectory(stacktrace) add_subdirectory(stacktrace)
add_subdirectory(folly_memcpy) add_subdirectory(folly_memcpy)
add_subdirectory(rapidxml)
add_subdirectory(sqlite) add_subdirectory(sqlite)
add_subdirectory(SimpleOpt) add_subdirectory(SimpleOpt)
add_subdirectory(fmt-8.1.1) add_subdirectory(fmt-8.1.1)

2
contrib/rapidxml/CMakeLists.txt Normal file
View File

@ -0,0 +1,2 @@
add_library(rapidxml INTERFACE)
target_include_directories(rapidxml INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")

0
fdbclient/include/fdbclient/rapidxml/rapidxml.hpp → contrib/rapidxml/include/rapidxml/rapidxml.hpp
View File

0
fdbclient/include/fdbclient/rapidxml/rapidxml_iterators.hpp → contrib/rapidxml/include/rapidxml/rapidxml_iterators.hpp
View File

0
fdbclient/include/fdbclient/rapidxml/rapidxml_print.hpp → contrib/rapidxml/include/rapidxml/rapidxml_print.hpp
View File

0
fdbclient/include/fdbclient/rapidxml/rapidxml_utils.hpp → contrib/rapidxml/include/rapidxml/rapidxml_utils.hpp
View File

0
fdbclient/rapidxml/license.txt → contrib/rapidxml/license.txt
View File

0
fdbclient/rapidxml/manual.html → contrib/rapidxml/manual.html
View File

4
fdbclient/CMakeLists.txt
View File

@ -80,7 +80,7 @@ add_flow_target(STATIC_LIBRARY NAME fdbclient SRCS ${FDBCLIENT_SRCS} ADDL_SRCS $
target_include_directories(fdbclient PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include") target_include_directories(fdbclient PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/versions.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/versions.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/versions.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/versions.h)
add_dependencies(fdbclient fdboptions) add_dependencies(fdbclient fdboptions)
target_link_libraries(fdbclient PUBLIC fdbrpc msgpack) target_link_libraries(fdbclient PUBLIC fdbrpc msgpack PRIVATE rapidxml)
# Create a separate fdbclient library with sampling enabled. This lets # Create a separate fdbclient library with sampling enabled. This lets
# fdbserver retain sampling functionality in client code while disabling # fdbserver retain sampling functionality in client code while disabling
@ -88,7 +88,7 @@ target_link_libraries(fdbclient PUBLIC fdbrpc msgpack)
add_flow_target(STATIC_LIBRARY NAME fdbclient_sampling SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs}) add_flow_target(STATIC_LIBRARY NAME fdbclient_sampling SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs})
target_include_directories(fdbclient_sampling PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include") target_include_directories(fdbclient_sampling PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include")
add_dependencies(fdbclient_sampling fdboptions) add_dependencies(fdbclient_sampling fdboptions)
target_link_libraries(fdbclient_sampling PUBLIC fdbrpc_sampling msgpack) target_link_libraries(fdbclient_sampling PUBLIC fdbrpc_sampling msgpack PRIVATE rapidxml)
target_compile_definitions(fdbclient_sampling PRIVATE -DENABLE_SAMPLING) target_compile_definitions(fdbclient_sampling PRIVATE -DENABLE_SAMPLING)
if(WIN32) if(WIN32)
add_dependencies(fdbclient_sampling_actors fdbclient_actors) add_dependencies(fdbclient_sampling_actors fdbclient_actors)

2
fdbclient/S3BlobStore.actor.cpp
View File

@ -40,7 +40,7 @@
#include "flow/IAsyncFile.h" #include "flow/IAsyncFile.h"
#include "flow/Hostname.h" #include "flow/Hostname.h"
#include "flow/UnitTest.h" #include "flow/UnitTest.h"
#include "fdbclient/rapidxml/rapidxml.hpp" #include "rapidxml/rapidxml.hpp"
#ifdef BUILD_AWS_BACKUP #ifdef BUILD_AWS_BACKUP
#include "fdbclient/FDBAWSCredentialsProvider.h" #include "fdbclient/FDBAWSCredentialsProvider.h"
#endif #endif