Try finding RapidJSON with pkg-config before fetching with git

This makes offline builds possible. RapidJSON also installs a CMake
config package, but it is an old style package that is unsuitable for
cross-compiling. pkg-config handles this better.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

Author: chewi

CMake/FindRapidJSON.cmake

@@ -0,0 +1,19 @@
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+    pkg_check_modules(RAPIDJSON RapidJSON)
+endif()
+
+if (NOT RAPIDJSON_FOUND)
+    if (NOT rapidjson_POPULATED)
+      FetchContent_Populate(
+        rapidjson
+        GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
+        GIT_TAG 80b6d1c83402a5785c486603c5611923159d0894
+        GIT_SUBMODULES ""
+      )
+    endif()
+    FetchContent_GetProperties(rapidjson)
+    set(RAPIDJSON_INCLUDE_DIRS "${rapidjson_SOURCE_DIR}/include")
+endif()
+
+add_definitions("-DRAPIDJSON_HAS_STDSTRING=1")

CMake/Findrapidjson.cmake

@@ -1,7 +1,7 @@
 find_package(CURL REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(aio REQUIRED)
-find_package(rapidjson REQUIRED)
+find_package(RapidJSON REQUIRED MODULE)
 
 link_libraries(rt pthread resolv)
 
@@ -19,7 +19,7 @@ add_library(overlaybd_image_lib
 target_include_directories(overlaybd_image_lib PUBLIC
   ${CURL_INCLUDE_DIRS}
   ${OPENSSL_INCLUDE_DIR}
-  ${rapidjson_SOURCE_DIR}/include
+  ${RAPIDJSON_INCLUDE_DIRS}
   ${PHOTON_INCLUDE_DIR}
 )
 
@@ -39,7 +39,7 @@ target_include_directories(overlaybd-tcmu PUBLIC
   ${TCMU_INCLUDE_DIR}
   ${CURL_INCLUDE_DIRS}
   ${OPENSSL_INCLUDE_DIR}
-  ${rapidjson_SOURCE_DIR}/include
+  ${RAPIDJSON_INCLUDE_DIRS}
   ${PHOTON_INCLUDE_DIR}
 )
 target_link_libraries(overlaybd-tcmu

src/CMakeLists.txt

@@ -5,6 +5,6 @@ find_package(CURL REQUIRED)
 add_library(registryfs_lib STATIC ${SOURCE_REGISTRYFS})
 target_include_directories(registryfs_lib PUBLIC
     ${CURL_INCLUDE_DIRS}
-    ${rapidjson_SOURCE_DIR}/include
+    ${RAPIDJSON_INCLUDE_DIRS}
     ${PHOTON_INCLUDE_DIR}
 )

src/overlaybd/registryfs/CMakeLists.txt

@@ -3,7 +3,7 @@ file(GLOB SOURCE_SERV "*.cpp")
 add_executable(overlaybd-streamConv ${SOURCE_SERV})
 target_include_directories(overlaybd-streamConv PUBLIC
     ${PHOTON_INCLUDE_DIR}
-    ${rapidjson_SOURCE_DIR}/include
+    ${RAPIDJSON_INCLUDE_DIRS}
 )
 target_link_libraries(overlaybd-streamConv
     photon_static

src/overlaybd/stream_convertor/CMakeLists.txt

@@ -12,7 +12,7 @@ target_link_libraries(erofs_simple_test gtest gtest_main pthread photon_static
 
 target_include_directories(erofs_simple_test PUBLIC
     ${PHOTON_INCLUDE_DIR}
-    ${rapidjson_SOURCE_DIR}/include
+    ${RAPIDJSON_INCLUDE_DIRS}
 )
 
 add_test(
@@ -28,7 +28,7 @@ target_link_libraries(erofs_stress_test gtest gtest_main pthread photon_static
 
 target_include_directories(erofs_stress_test PUBLIC
     ${PHOTON_INCLUDE_DIR}
-    ${rapidjson_SOURCE_DIR}/include
+    ${RAPIDJSON_INCLUDE_DIRS}
 )
 
 add_test(

src/overlaybd/tar/erofs/test/CMakeLists.txt

@@ -7,7 +7,7 @@ link_directories($ENV{GTEST}/lib)
 add_executable(image_service_test image_service_test.cpp)
 target_include_directories(image_service_test PUBLIC
     ${PHOTON_INCLUDE_DIR}
-    ${rapidjson_SOURCE_DIR}/include
+    ${RAPIDJSON_INCLUDE_DIRS}
 )
 target_link_libraries(image_service_test gtest gtest_main gflags pthread photon_static overlaybd_lib overlaybd_image_lib)
 
@@ -34,14 +34,14 @@ gtest
 
 target_include_directories(simple_credsrv_test PUBLIC
     ${PHOTON_INCLUDE_DIR}
-    ${rapidjson_SOURCE_DIR}/include
+    ${RAPIDJSON_INCLUDE_DIRS}
     $ENV{GTEST}/googletest/include
 )
 
 add_executable(trace_test trace_test.cpp ../tools/comm_func.cpp)
 target_include_directories(trace_test PUBLIC
     ${PHOTON_INCLUDE_DIR}
-    ${rapidjson_SOURCE_DIR}/include
+    ${RAPIDJSON_INCLUDE_DIRS}
 )
 target_link_libraries(trace_test gtest gtest_main gflags pthread photon_static overlaybd_lib overlaybd_image_lib)
 

src/test/CMakeLists.txt

@@ -17,12 +17,12 @@ target_include_directories(overlaybd-zfile PUBLIC ${PHOTON_INCLUDE_DIR})
 target_link_libraries(overlaybd-zfile photon_static overlaybd_lib)
 
 add_executable(overlaybd-apply overlaybd-apply.cpp)
-target_include_directories(overlaybd-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${rapidjson_SOURCE_DIR}/include)
+target_include_directories(overlaybd-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIRS})
 target_link_libraries(overlaybd-apply photon_static overlaybd_lib overlaybd_image_lib checksum_lib)
 set_target_properties(overlaybd-apply PROPERTIES INSTALL_RPATH "/opt/overlaybd/lib")
 
 add_executable(turboOCI-apply turboOCI-apply.cpp)
-target_include_directories(turboOCI-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${rapidjson_SOURCE_DIR}/include)
+target_include_directories(turboOCI-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIRS})
 target_link_libraries(turboOCI-apply photon_static overlaybd_lib overlaybd_image_lib)
 set_target_properties(turboOCI-apply PROPERTIES INSTALL_RPATH "/opt/overlaybd/lib")