Skip to content

Commit

Permalink
admin: Reset main to be development for an eventual 3.1 (#4495)
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Gritz <lg@larrygritz.com>
  • Loading branch information
lgritz authored Oct 16, 2024
1 parent c2b344b commit db9fe34
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
28 changes: 28 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
Release 3.1 (target: Sept 2025?) -- compared to 3.0
---------------------------------------------------
### New minimum dependencies and compatibility changes:

### ⛰️ New features and public API changes:

### 🚀 Performance improvements:

### 🐛 Fixes and feature enhancements:

### 🔧 Internals and developer goodies

### 🏗 Build/test/CI and platform ports:
* CMake build system and scripts:
* Dependency support:
* Testing and Continuous integration (CI) systems:
* Platform support:

### 📚 Notable documentation changes:

### 🏢 Project Administration



---
---


Release 3.0 (beta 1 - Oct 15, 2024) -- compared to 2.5.16.0
-----------------------------------------------------------
Executive Summary / Highlights:
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

cmake_minimum_required (VERSION 3.18.2)

set (OpenImageIO_VERSION "3.0.0.0")
set (OpenImageIO_VERSION "3.1.0.0")
set (OpenImageIO_VERSION_OVERRIDE "" CACHE STRING
"Version override (use with caution)!")
mark_as_advanced (OpenImageIO_VERSION_OVERRIDE)
Expand All @@ -19,12 +19,12 @@ project (OpenImageIO VERSION ${OpenImageIO_VERSION}
set (PROJ_NAME OIIO) # short name, caps
string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case
string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case
set (PROJECT_VERSION_RELEASE_TYPE "beta1" CACHE STRING
set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING
"Build type, for example: dev, beta2, RC1 (empty string for normal release)")
set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE})
set (PROJECT_AUTHORS "Contributors to the OpenImageIO project")
option (${PROJECT_NAME}_SUPPORTED_RELEASE
"Set ON for supported release branches, OFF for 'main'" ON)
"Set ON for supported release branches, OFF for 'main'" OFF)
if (${PROJECT_NAME}_SUPPORTED_RELEASE)
set (${PROJECT_NAME}_DEV_RELEASE OFF)
else ()
Expand Down

0 comments on commit db9fe34

Please sign in to comment.