Skip to content

Commit d8f28b8

Browse files
authored
Bump versions in preparation for 1.14 beta (#1940)
Signed-off-by: Larry Gritz <[email protected]>
1 parent 8b71d4d commit d8f28b8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<!-- SPDX-License-Identifier: CC-BY-4.0 -->
22
<!-- Copyright Contributors to the Open Shading Language Project. -->
33

4-
Release 1.14.4.0 -- in progress (compared to 1.13)
4+
Release 1.14 (v1.14.4.0 - 12 Feb 2025) -- compared to 1.13
55
-------------------------------------------------------------
6+
- v1.14.4.0-beta1 - 12 Feb 2025
67

78
### New minimum dependencies, toolchain, and compatibility changes:
89
* **C++**: Raise C++ standard to 17 (from 14), gcc min to 9.3 (from 6.3), clang min to 5.0 [#1847](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1847) (1.14.2.0)

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ project (OSL VERSION ${OSL_VERSION}
1818
set (PROJ_NAME ${PROJECT_NAME}) # short name
1919
string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case
2020
string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case
21-
set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING
21+
set (PROJECT_VERSION_RELEASE_TYPE "beta1" CACHE STRING
2222
"Build type, for example: dev, beta2, RC1 (empty string for normal release)")
2323
set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE})
2424
set (PROJECT_AUTHORS "Contributors to the Open Shading Language project")
2525
option (${PROJECT_NAME}_SUPPORTED_RELEASE
26-
"Set ON for supported release branch, OFF for master" OFF)
26+
"Set ON for supported release branch, OFF for master" ON)
2727
if (${PROJECT_NAME}_SUPPORTED_RELEASE)
2828
set (${PROJECT_NAME}_DEV_RELEASE OFF)
2929
else ()

0 commit comments

Comments
 (0)