修正cmake的异常

czyt1988 · Aug 4, 2023 · 37ec006 · 37ec006
1 parent c3ac0b5
commit 37ec006
Show file tree

Hide file tree

Showing 6 changed files with 9,379 additions and 9,335 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(SARIBBON_VERSION_MAJOR 0)
-set(SARIBBON_VERSION_MINOR 4)
-set(SARIBBON_VERSION_PATCH 0)
+set(SARIBBON_VERSION_MINOR 6)
+set(SARIBBON_VERSION_PATCH 1)
 set(SARIBBON_VERSION "${SARIBBON_VERSION_MAJOR}.${SARIBBON_VERSION_MINOR}.${SARIBBON_VERSION_PATCH}")
 project(SARibbon VERSION ${SARIBBON_VERSION} LANGUAGES CXX)
 

diff --git a/cmake/WinResource.cmake b/cmake/WinResource.cmake
@@ -2,7 +2,7 @@ macro(create_win32_resource_version)
 	if(MSVC) # TODO: MinGW (http://www.mingw.org/wiki/MS_resource_compiler)
 		set(_target)
 		set(_filename)
-		set(_version ${SARIBBON_VERSION})
+		set(_version ${PROJECT_VERSION})
 		set(_ext "ico")
 		set(_companyname "https://github.com/czyt1988/SARibbon")
 		set(_copyright "Copyright (C) 2020 by czyt1988")