[Release] Nuget fix #2

Agrael1 · Jan 28, 2025 · a7986bf · a7986bf
1 parent a6b7d35
commit a7986bf
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 cmake_minimum_required(VERSION 3.22)
 
-set(WISDOM_VERSION "0.6.1")
+set(WISDOM_VERSION "0.6.2")
 project("Wisdom" VERSION ${WISDOM_VERSION})
 
 set(CMAKE_DEBUG_POSTFIX d)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -123,7 +123,8 @@
       "binaryDir": "${sourceDir}/build/debug",
       "installDir": "${sourceDir}/install/debug",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
+        "CMAKE_BUILD_TYPE": "Debug",
+        "WISDOM_GENERATE_FUNCTIONS": false
       }
     },
     {
@@ -134,7 +135,8 @@
       "binaryDir": "${sourceDir}/build/release",
       "installDir": "${sourceDir}/install/release",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
+        "CMAKE_BUILD_TYPE": "Release",
+        "WISDOM_GENERATE_FUNCTIONS": false
       }
     }
   ]

diff --git a/Changelog.md b/Changelog.md
@@ -1,9 +1,8 @@
 # Version History
 
-- 0.6.1 Nuget package update
+- 0.6.1 - 0.6.2 Nuget package update
 
   - Fixed Vulkan headers in the Nuget package
-  - Force Vulkan now enables all the dirs by default, even if SDK is not present
 
 - 0.6.0 Raytracing
 

diff --git a/cmake/settings.cmake b/cmake/settings.cmake
@@ -48,7 +48,7 @@ option(WISDOM_BUILD_DOCS "Build the documentation." ${WTOP})
 option(WISDOM_BUILD_BINDINGS "Build the C bindings library." ON)
 option(WISDOM_SHARED_LIB "Build shared library for C bindings" ON)
 
-option(WISDOM_GENERATE_FUNCTIONS "Build shared library for C bindings" ${WDEBUG})
+option(WISDOM_GENERATE_FUNCTIONS "Build shared library for C bindings" OFF)
 option(WISDOM_GENERATE_API "Generate the API" ${GEN})
 option(WISDOM_USE_SYSTEM_DXC "Use dxc from PATH" OFF)
 

diff --git a/cmake/wisdom.props b/cmake/wisdom.props
@@ -1,27 +1,24 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <WisdomLinkage Condition="'$(WisdomLinkage)' == ''">static</WisdomLinkage>
-        <WisdomForceVulkan Condition="'$(WisdomForceVulkan)' == ''">false</WisdomForceVulkan>
-        <WisdomVulkanSDKPath Condition="'$(WisdomVulkanSDKPath)' == ''">$(VULKAN_SDK)\Include</WisdomVulkanSDKPath>
-        <WisdomLogLevel Condition="'$(WisdomLogLevel)' == ''">warn</WisdomLogLevel>
+<Project>
+  <PropertyGroup>
+    <WisdomLinkage Condition="'$(WisdomLinkage)' == ''">static</WisdomLinkage>
+    <WisdomForceVulkan Condition="'$(WisdomForceVulkan)' == ''">false</WisdomForceVulkan>
+    <WisdomVulkanSDKPath Condition="'$(WisdomVulkanSDKPath)' == ''">$(VULKAN_SDK)\Include</WisdomVulkanSDKPath>
+    <WisdomLogLevel Condition="'$(WisdomLogLevel)' == ''">warn</WisdomLogLevel>
 
-        <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'debug'">0</WisdomLogLevelValue>
-        <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'trace'">1</WisdomLogLevelValue>
-        <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'info'">2</WisdomLogLevelValue>
-        <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'warn'">3</WisdomLogLevelValue>
-        <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'error'">4</WisdomLogLevelValue>
-        <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'critical'">5</WisdomLogLevelValue>
+    <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'debug'">0</WisdomLogLevelValue>
+    <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'trace'">1</WisdomLogLevelValue>
+    <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'info'">2</WisdomLogLevelValue>
+    <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'warn'">3</WisdomLogLevelValue>
+    <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'error'">4</WisdomLogLevelValue>
+    <WisdomLogLevelValue Condition="'$(WisdomLogLevel)' == 'critical'">5</WisdomLogLevelValue>
 
-        <WisdomVulkanEnabled Condition="Exists('$(WisdomVulkanSDKPath)') Or '$(WisdomForceVulkan)' == 'true'">true</WisdomVulkanEnabled>
-        <WisdomVulkanEnabled Condition="!Exists('$(WisdomVulkanSDKPath)') And '$(WisdomForceVulkan)' != 'true'">false</WisdomVulkanEnabled>
+    <LibraryPostfix Condition="'$(Configuration)' == 'Debug'">d</LibraryPostfix>
+    <LibraryPostfix Condition="'$(Configuration)' != 'Debug'"></LibraryPostfix>
+    <LP>$(LibraryPostfix)</LP>
+  </PropertyGroup>
 
-        <LibraryPostfix Condition="'$(Configuration)' == 'Debug'">d</LibraryPostfix>
-        <LibraryPostfix Condition="'$(Configuration)' != 'Debug'"></LibraryPostfix>
-        <LP>$(LibraryPostfix)</LP>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PropertyPageSchema Include="$(MSBuildThisFileDirectory)\wisdom.xml"/>
-        <ProjectCapability Include="Wisdom" />
-    </ItemGroup>
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)\wisdom.xml"/>
+    <ProjectCapability Include="Wisdom" />
+  </ItemGroup>
 </Project>
diff --git a/cmake/wisdom.targets b/cmake/wisdom.targets
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WisdomVulkanEnabled Condition="Exists('$(WisdomVulkanSDKPath)')">true</WisdomVulkanEnabled>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\include\;$(MSBuildThisFileDirectory)..\..\include\dxma;$(AdditionalIncludeDirectoriesVK);$(MSBuildThisFileDirectory)..\..\include\d3dx12;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>