Cleanup for Doxytag generation

jfalcou · Nov 9, 2024 · 64acbcf · 64acbcf
1 parent 0310dd0
commit 64acbcf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -13,7 +13,7 @@ jobs:
   generate-doc:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/jfalcou/compilers:v6
+      image: ghcr.io/jfalcou/compilers:v8
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -18,7 +18,7 @@ jobs:
   install:
     runs-on: [ubuntu-latest]
     container:
-      image: ghcr.io/jfalcou/compilers:v6
+      image: ghcr.io/jfalcou/compilers:v8
     strategy:
       fail-fast: false
 
@@ -41,7 +41,7 @@ jobs:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
     runs-on: [ubuntu-latest]
     container:
-      image: ghcr.io/jfalcou/compilers:v6
+      image: ghcr.io/jfalcou/compilers:v8
     strategy:
       fail-fast: false
 
@@ -60,7 +60,7 @@ jobs:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
     runs-on: [ubuntu-latest]
     container:
-      image: ghcr.io/jfalcou/compilers:v6
+      image: ghcr.io/jfalcou/compilers:v8
     strategy:
       fail-fast: false
 

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -45,7 +45,7 @@ jobs:
   linux:
     runs-on: [ubuntu-latest]
     container:
-      image: ghcr.io/jfalcou/compilers:v7
+      image: ghcr.io/jfalcou/compilers:v8
     strategy:
       fail-fast: false
       matrix:
@@ -67,15 +67,13 @@ jobs:
         run:  cd build && make tts-test -j 2 && ctest --output-on-failure -j 2
 
   macosx:
-    runs-on: [macos-12]
+    runs-on: [macos-14]
     strategy:
       fail-fast: false
       matrix:
         cfg:
-        - { compiler: g++-12  , opts: -O0                                 , linker:                 }
         - { compiler: clang++ , opts: -O0                                 , linker:                 }
         - { compiler: clang++ , opts: "-O3 -flto -DNDEBUG"                , linker:                 }
-        - { compiler: g++-12  , opts: "-O3 -flto -DNDEBUG"                , linker:                 }
         - { compiler: clang++ , opts: "-O3 -flto -DNDEBUG -stdlib=libc++" , linker: -stdlib=libc++  }
         - { compiler: clang++ , opts: "-O0 -stdlib=libc++"                , linker: -stdlib=libc++  }
     steps:
@@ -89,7 +87,7 @@ jobs:
         run:  cd build && make tts-test -j 2 && ctest --output-on-failure -j 2
 
   android:
-    runs-on: [macos-12]
+    runs-on: [macos-14]
     strategy:
       fail-fast: false
       matrix:
@@ -109,7 +107,7 @@ jobs:
   wasm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/jfalcou/compilers:v7
+      image: ghcr.io/jfalcou/compilers:v8
     strategy:
       fail-fast: false
       matrix:

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -7,7 +7,7 @@
 ##======================================================================================================================
 ## Download and setup CPM
 ##======================================================================================================================
-set(CPM_DOWNLOAD_VERSION 0.34.0)
+set(CPM_DOWNLOAD_VERSION 0.40.2)
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -97,6 +97,7 @@ RECURSIVE              = YES
 EXCLUDE_SYMBOLS        = detail*
 SOURCE_BROWSER         = NO
 VERBATIM_HEADERS       = NO
+GENERATE_TAGFILE       = $(DOXYGEN_OUPUT)/tts.tag
 
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output