From 4feb683219d5f99926cbb29d2b26c1bddb0e5983 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Oct 2025 21:38:45 +0200 Subject: [PATCH 1/2] Port VSG_SUPPORTS_Windowing to option --- CMakeLists.txt | 2 +- src/vsg/core/Version.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62940f9835..995b3f7554 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ if (VSG_SUPPORTS_ShaderCompiler) endif() endif() -set(VSG_SUPPORTS_Windowing 1 CACHE STRING "Optional native windowing support providing a default implementation of vsg::Window::create(), 0 for off, 1 for enabled." ) +option(VSG_SUPPORTS_Windowing "Optional native windowing support providing a default implementation of vsg::Window::create()" ON) if (VSG_SUPPORTS_Windowing) if (ANDROID) set(FIND_DEPENDENCY_WINDOWING "") diff --git a/src/vsg/core/Version.h.in b/src/vsg/core/Version.h.in index 1926da8292..2c492bdb27 100644 --- a/src/vsg/core/Version.h.in +++ b/src/vsg/core/Version.h.in @@ -43,7 +43,7 @@ extern "C" #cmakedefine01 VSG_SUPPORTS_ShaderOptimizer /// Native Windowing support provided with vsg::Window::create(windowTraits) enabled when 1, disabled when 0 - #define VSG_SUPPORTS_Windowing @VSG_SUPPORTS_Windowing@ + #cmakedefine01 VSG_SUPPORTS_Windowing struct VsgVersion { From c1fba59216b7b1c933a4c9948083b288d8e879ec Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Oct 2025 21:40:11 +0200 Subject: [PATCH 2/2] Port VSG_SUPPORTS_ShaderCompiler to option --- CMakeLists.txt | 2 +- src/vsg/core/Version.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 995b3f7554..fab1864081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ find_package(Threads REQUIRED) set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level to build into the VSG library, 0 for off, 1 coarse grained, 2 medium, 3 fine grained." ) # Enable/disable shader compilation support that pulls in glslang -set(VSG_SUPPORTS_ShaderCompiler 1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." ) +option(VSG_SUPPORTS_ShaderCompiler "Optional shader compiler support" ON) if (VSG_SUPPORTS_ShaderCompiler) # Try looking for glslang 15 first. diff --git a/src/vsg/core/Version.h.in b/src/vsg/core/Version.h.in index 2c492bdb27..2a14bf28b6 100644 --- a/src/vsg/core/Version.h.in +++ b/src/vsg/core/Version.h.in @@ -37,7 +37,7 @@ extern "C" #define VSG_MAX_INSTRUMENTATION_LEVEL @VSG_MAX_INSTRUMENTATION_LEVEL@ /// vsg::ShaderCompiler support enabled when 1, disabled when 0 - #define VSG_SUPPORTS_ShaderCompiler @VSG_SUPPORTS_ShaderCompiler@ + #cmakedefine01 VSG_SUPPORTS_ShaderCompiler /// vsg::ShaderCompiler optimizer support enabled when 1, disabled when 0 #cmakedefine01 VSG_SUPPORTS_ShaderOptimizer