Merge commit 'afef2591c14ce3956ddcb7f1e605b6932c080d9f' into feature/…

…add_test

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   Test:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -80,16 +80,17 @@ jobs:
           cppcheck: true
           clangtidy: true
           task: true
-          doxygen: true
+          doxygen: ${{ !contains(matrix.os, 'macos-11') }}
 
       - name: Test
+        if: ${{ !cancelled() }}
         run: |
           task test
         env:
           CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
 
       - name: Lint
-        if: ${{ matrix.os == 'ubuntu-20.04' && matrix.compiler == 'gcc' }}
+        if: ${{ !cancelled() && matrix.os == 'ubuntu-20.04' && matrix.compiler == 'gcc' }}
         run: |
           # TODO add to setup-cpp
           python3 -m pip install --user cmakelint cmake-format

README.md

@@ -67,7 +67,7 @@ endif()
 
 # Add project_options from https://github.com/aminya/project_options
 # Change the version in the following URL to update the package (watch the releases of the repository for future updates)
-set(PROJECT_OPTIONS_VERSION "v0.32.2")
+set(PROJECT_OPTIONS_VERSION "v0.34.0")
 FetchContent_Declare(
   _project_options
   URL https://github.com/aminya/project_options/archive/refs/tags/${PROJECT_OPTIONS_VERSION}.zip)
@@ -77,8 +77,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)
 # install vcpkg dependencies: - should be called before defining project()
 run_vcpkg(
     VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-    VCPKG_REV "0fa8459cf3a7caca7adc58f992bc32ff13630684"
-    ENABLE_VCPKG_UPDATE
+    VCPKG_REV "10e052511428d6b0c7fcc63a139e8024bb146032"
 )
 
 # Set the project name and language

docs/src/project_options_example.md

@@ -20,7 +20,7 @@ endif()
 
 # Add project_options from https://github.com/aminya/project_options
 # Change the version in the following URL to update the package (watch the releases of the repository for future updates)
-set(PROJECT_OPTIONS_VERSION "v0.32.2")
+set(PROJECT_OPTIONS_VERSION "v0.34.0")
 FetchContent_Declare(
   _project_options
   URL https://github.com/aminya/project_options/archive/refs/tags/${PROJECT_OPTIONS_VERSION}.zip)
@@ -30,7 +30,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)
 # install vcpkg dependencies: - should be called before defining project()
 run_vcpkg(
     VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-    VCPKG_REV "0fa8459cf3a7caca7adc58f992bc32ff13630684"
+    VCPKG_REV "10e052511428d6b0c7fcc63a139e8024bb146032"
     ENABLE_VCPKG_UPDATE
 )
 

package.json

@@ -1,4 +1,5 @@
 {
     "name": "project_options",
+    "version": "0.34.0",
     "homepage": "http://aminya.github.io/project_options"
 }

src/Doxygen.cmake

@@ -79,7 +79,11 @@ function(enable_doxygen DOXYGEN_THEME)
   endif()
 
   # find doxygen and dot if available
-  find_package(Doxygen REQUIRED OPTIONAL_COMPONENTS dot)
+  find_package(Doxygen OPTIONAL_COMPONENTS dot)
+  if (NOT Doxygen_FOUND)
+    message(WARNING "Doxygen not found, install doxygen and try again. Documentation will not be generated.")
+    return()
+  endif()
 
   # add doxygen-docs target
   message(STATUS "Adding `doxygen-docs` target that builds the documentation.")

src/DynamicProjectOptions.cmake

@@ -55,7 +55,7 @@ Here is an example of how to use ``dynamic_project_options``:
 
    # Add project_options from https://github.com/aminya/project_options
    # Change the version in the following URL to update the package (watch the releases of the repository for future updates)
-   set(PROJECT_OPTIONS_VERSION "v0.32.2")
+   set(PROJECT_OPTIONS_VERSION "v0.34.0")
    FetchContent_Declare(
      _project_options
      URL https://github.com/aminya/project_options/archive/refs/tags/${PROJECT_OPTIONS_VERSION}.zip)