Skip to content

Commit db9fe34

Browse files
authored
admin: Reset main to be development for an eventual 3.1 (AcademySoftwareFoundation#4495)
Signed-off-by: Larry Gritz <[email protected]>
1 parent c2b344b commit db9fe34

File tree

2 files changed

+31
-3
lines changed

2 files changed

+31
-3
lines changed

CHANGES.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
Release 3.1 (target: Sept 2025?) -- compared to 3.0
2+
---------------------------------------------------
3+
### New minimum dependencies and compatibility changes:
4+
5+
### ⛰️ New features and public API changes:
6+
7+
### 🚀 Performance improvements:
8+
9+
### 🐛 Fixes and feature enhancements:
10+
11+
### 🔧 Internals and developer goodies
12+
13+
### 🏗 Build/test/CI and platform ports:
14+
* CMake build system and scripts:
15+
* Dependency support:
16+
* Testing and Continuous integration (CI) systems:
17+
* Platform support:
18+
19+
### 📚 Notable documentation changes:
20+
21+
### 🏢 Project Administration
22+
23+
24+
25+
---
26+
---
27+
28+
129
Release 3.0 (beta 1 - Oct 15, 2024) -- compared to 2.5.16.0
230
-----------------------------------------------------------
331
Executive Summary / Highlights:

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
cmake_minimum_required (VERSION 3.18.2)
66

7-
set (OpenImageIO_VERSION "3.0.0.0")
7+
set (OpenImageIO_VERSION "3.1.0.0")
88
set (OpenImageIO_VERSION_OVERRIDE "" CACHE STRING
99
"Version override (use with caution)!")
1010
mark_as_advanced (OpenImageIO_VERSION_OVERRIDE)
@@ -19,12 +19,12 @@ project (OpenImageIO VERSION ${OpenImageIO_VERSION}
1919
set (PROJ_NAME OIIO) # short name, caps
2020
string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case
2121
string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case
22-
set (PROJECT_VERSION_RELEASE_TYPE "beta1" CACHE STRING
22+
set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING
2323
"Build type, for example: dev, beta2, RC1 (empty string for normal release)")
2424
set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE})
2525
set (PROJECT_AUTHORS "Contributors to the OpenImageIO project")
2626
option (${PROJECT_NAME}_SUPPORTED_RELEASE
27-
"Set ON for supported release branches, OFF for 'main'" ON)
27+
"Set ON for supported release branches, OFF for 'main'" OFF)
2828
if (${PROJECT_NAME}_SUPPORTED_RELEASE)
2929
set (${PROJECT_NAME}_DEV_RELEASE OFF)
3030
else ()

0 commit comments

Comments
 (0)