Merge remote-tracking branch 'upstream/main' into fix-clang-format-reports

Author: uilianries

.github/workflows/android.yml

@@ -15,27 +15,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image:
-          - r22
         platform:
+          - android-26
           - android-27
-          - android-29
         abi:
           - armeabi-v7a
           - arm64-v8a
         build_type: [Debug, Release]
 
     runs-on: ubuntu-latest
 
-    container:
-      image: bojoe/cpp-android-ndk-build-env-ubuntu:${{ matrix.image }}
-      options: --user root
-
     steps:
-      - uses: actions/checkout@v3
+      - name: Install Ninja
+        run: sudo apt-get install ninja-build
+
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - run: cmake -H$GITHUB_WORKSPACE -B/home/developer/build -GNinja -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.abi }} -DANDROID_PLATFORM=${{ matrix.platform }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+      - run: cmake -H$GITHUB_WORKSPACE -B$GITHUB_WORKSPACE/build -GNinja -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.abi }} -DANDROID_PLATFORM=${{ matrix.platform }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 
-      - run: cmake --build /home/developer/build
+      - run: cmake --build $GITHUB_WORKSPACE/build

.github/workflows/code-coverage.yml

@@ -30,5 +30,6 @@ jobs:
     - working-directory: build/
       run: ctest --output-on-failure
 
-    - working-directory: build/
-      run: bash <(curl -s https://codecov.io/bash)
+    - uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/macos.yml

@@ -16,34 +16,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: 11
-            build_type: Debug
-            os: macos-11
-          - xcode: 11
+          - xcode: 14
             build_type: Release
-            os: macos-11
-          - xcode: 12
-            build_type: Debug
-            os: macos-11
-          - xcode: 12
+            os: macos-13
+          - xcode: 15
             build_type: Release
-            os: macos-11
-          - xcode: 13
-            build_type: Debug
-            os: macos-12
-          - xcode: 13
+            os: macos-14
+          - xcode: 16
             build_type: Release
-            os: macos-12
-          - xcode: 14
-            build_type: Debug
-            os: macos-12
-          - xcode: 14
-            build_type: Release
-            os: macos-12
+            os: macos-15
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - name: Install Ninja
+      run: brew install ninja
+
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -54,10 +42,10 @@ jobs:
     - run: cmake -E make_directory build
 
     - working-directory: build/
-      run: cmake $GITHUB_WORKSPACE
+      run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 
     - working-directory: build/
-      run: cmake --build . --config ${{ matrix.build_type }}
+      run: cmake --build .
 
     - working-directory: build/
-      run: ctest --config ${{ matrix.build_type }} --output-on-failure
+      run: ctest --output-on-failure

.pkg-config/taocpp-json.pc.in

@@ -0,0 +1,7 @@
+includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"
+
+Name: @PROJECT_NAME@
+Description: taoJSON is a C++ header-only JSON library
+Version: @PROJECT_VERSION@
+URL: https://github.com/taocpp/json
+Cflags: -I${includedir}

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8...3.19)
+cmake_minimum_required(VERSION 3.10)
 
 project(taocpp-json VERSION 1.0.0 LANGUAGES CXX)
 
@@ -12,6 +12,7 @@ include(GNUInstallDirs)
 
 set(TAOCPP_JSON_INSTALL_DOC_DIR "${CMAKE_INSTALL_DOCDIR}/tao/json" CACHE STRING "The installation doc directory")
 set(TAOCPP_JSON_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake" CACHE STRING "The installation cmake directory")
+set(TAOCPP_JSON_INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig" CACHE STRING "The installation pkgconfig directory")
 
 # define a header-only library
 add_library(taocpp-json INTERFACE)
@@ -61,13 +62,20 @@ option(TAOCPP_JSON_INSTALL "Generate the install target" ${TAOCPP_JSON_IS_MAIN_P
 if(TAOCPP_JSON_INSTALL)
   include(CMakePackageConfigHelpers)
 
-  # Make package findable
+  # Make package findable by CMake
   configure_package_config_file(.cmake/taocpp-json-config.cmake.in ${PROJECT_NAME}-config.cmake
     INSTALL_DESTINATION ${TAOCPP_JSON_INSTALL_CMAKE_DIR}
     NO_CHECK_REQUIRED_COMPONENTS_MACRO
     NO_SET_AND_CHECK_MACRO
   )
 
+  # Make package findable by pkg-config
+  configure_package_config_file(.pkg-config/taocpp-json.pc.in ${PROJECT_NAME}.pc
+    INSTALL_DESTINATION ${TAOCPP_JSON_INSTALL_PKGCONFIG_DIR}
+    NO_CHECK_REQUIRED_COMPONENTS_MACRO
+    NO_SET_AND_CHECK_MACRO
+  )
+
   # Ignore pointer width differences since this is a header-only library
   unset(CMAKE_SIZEOF_VOID_P)
 
@@ -84,6 +92,10 @@ if(TAOCPP_JSON_INSTALL)
     ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
     DESTINATION ${TAOCPP_JSON_INSTALL_CMAKE_DIR}
   )
+  install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
+    DESTINATION ${TAOCPP_JSON_INSTALL_PKGCONFIG_DIR}
+  )
   install(EXPORT ${PROJECT_NAME}-targets
     NAMESPACE taocpp::
     DESTINATION ${TAOCPP_JSON_INSTALL_CMAKE_DIR}