GHA: fixes

inviwo · Nov 27, 2024 · c1f65d1 · c1f65d1
1 parent 15e59ac
commit c1f65d1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/.github/presets/linux.json b/.github/presets/linux.json
@@ -24,7 +24,11 @@
       "cacheVariables": {
         "BUILD_SHARED_LIBS":  { "type": "BOOL", "value": "OFF"},
         "VCPKG_TARGET_TRIPLET": "x64-linux",
-        "VCPKG_HOST_TRIPLET": "x64-linux"
+        "VCPKG_HOST_TRIPLET": "x64-linux",
+
+        // The vcpkg graphvis package file in static mode
+        "VCPKG_MANIFEST_FEATURES" : "openmesh;nanovg",
+        "IVW_MODULE_GRAPHVIZ":      { "type": "BOOL", "value": "OFF"} 
       }
     },
     {

diff --git a/.github/presets/macos.json b/.github/presets/macos.json
@@ -10,7 +10,11 @@
       "displayName": "Xcode Developer configuration",
       "inherits" : ["common", "modules", "modules-vcpkg", "xcode", "developer", "vcpkg", "vcpkg-cache-write", "build"],
       "cacheVariables": {
-        "IVW_CFG_USE_CCACHE_XCODE": "ON"
+        "IVW_CFG_USE_CCACHE_XCODE": "ON",
+
+        // CEF has codesign issues
+        "IVW_MODULE_WEBBROWSER":      { "type": "BOOL", "value": "OFF"},
+        "IVW_MODULE_WEBQT":           { "type": "BOOL", "value": "OFF"}
       }
     },
     {
@@ -19,7 +23,11 @@
       "cacheVariables": {
         "BUILD_SHARED_LIBS":    { "type": "BOOL", "value": "OFF"},
         "VCPKG_TARGET_TRIPLET": "arm64-osx",
-        "VCPKG_HOST_TRIPLET":   "arm64-osx"
+        "VCPKG_HOST_TRIPLET":   "arm64-osx",
+
+        // The vcpkg graphvis package file in static mode
+        "VCPKG_MANIFEST_FEATURES" : "openmesh;nanovg",
+        "IVW_MODULE_GRAPHVIZ":      { "type": "BOOL", "value": "OFF"}
       }
     },
     {

diff --git a/.github/presets/windows.json b/.github/presets/windows.json
@@ -30,7 +30,12 @@
       "inherits" : ["gha"],
       "cacheVariables": {
         "IVW_DOXYGEN_PROJECT": "ON",
-        "IVW_DOXYGEN_LATEX_PATH": "C:/tools/TinyTeX/bin/win32/pdflatex.exe"
+        "IVW_DOXYGEN_LATEX_PATH": "C:/tools/TinyTeX/bin/win32/pdflatex.exe",
+
+        // The vcpkg graphvis package file in static mode
+        "VCPKG_MANIFEST_FEATURES" : "sgct;openmesh;nanovg",
+        "IVW_MODULE_GRAPHVIZ":      { "type": "BOOL", "value": "OFF"} 
+
       }
     }
   ]