[Bf-blender-cvs] [538d9bb41d7] master: Fixup for license changes
Dalai Felinto
noreply at git.blender.org
Thu Sep 24 15:51:55 CEST 2020
Commit: 538d9bb41d7fdaa50761f0807b6ebafd6c865723
Author: Dalai Felinto
Date: Thu Sep 24 15:47:49 2020 +0200
Branches: master
https://developer.blender.org/rB538d9bb41d7fdaa50761f0807b6ebafd6c865723
Fixup for license changes
There was still a cmake file that was explicitly referring to the GPL3 license.
This was failing only on Windows.
===================================================================
M build_files/cmake/packaging.cmake
===================================================================
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index de27d31323d..4a0a4f2493d 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -86,7 +86,7 @@ if(WIN32)
set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
- set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt)
+ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/license/GPL-3.0.txt)
set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
set(BLENDER_NAMESPACE_GUID "507F933F-5898-404A-9A05-18282FD491A6")
More information about the Bf-blender-cvs
mailing list