Merge pull request vsg-dev#1593 from dg0yt/cmakedefine

Use option/cmakedefine01 for VSG_SUPPORTS_ShaderCompiler/Windowing

Author: robertosfield

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.
@@ -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 "")

src/vsg/core/Version.h.in

@@ -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
     {