Skip to content

Use option/cmakedefine01 for VSG_SUPPORTS_ShaderCompiler/Windowing #1593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use option/cmakedefine01 for VSG_SUPPORTS_ShaderCompiler/Windowing #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4feb683
Port VSG_SUPPORTS_Windowing to option
dg0yt Oct 18, 2025
c1fba59
Port VSG_SUPPORTS_ShaderCompiler to option
dg0yt Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 "")
Expand Down
4 changes: 2 additions & 2 deletions src/vsg/core/Version.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ 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

/// 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
{
Expand Down