From 749a45a3d676ef2671760fe6f88fee51b5812ff9 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 1 Apr 2021 10:12:09 -0700 Subject: [PATCH] Bump main to 12.0.0~pre1 Signed-off-by: Louise Poubel --- .github/workflows/macos.yml | 2 +- CMakeLists.txt | 6 +++--- Changelog.md | 4 ++++ README.md | 6 +++--- examples/CMakeLists.txt | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 77e6c2066..af3f163a9 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ jobs: build: env: - PACKAGE: sdformat11 + PACKAGE: sdformat12 runs-on: macos-latest steps: - uses: actions/checkout@v2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 31e41b188..d5cbae109 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,18 +20,18 @@ if(UNIX AND NOT WIN32) endif(CMAKE_UNAME) endif() -project (sdformat11) +project (sdformat12) # The protocol version has nothing to do with the package version set below. # It represents the current version of sdformat implement by the software set (SDF_PROTOCOL_VERSION 1.8) -set (SDF_MAJOR_VERSION 11) +set (SDF_MAJOR_VERSION 12) set (SDF_MINOR_VERSION 0) set (SDF_PATCH_VERSION 0) set (SDF_VERSION ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}) -set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION}~pre3) +set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION}~pre1) string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) string(REGEX REPLACE "[0-9]+" "" PROJECT_NAME_NO_VERSION ${PROJECT_NAME}) diff --git a/Changelog.md b/Changelog.md index 044d93c16..bdf50df17 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## libsdformat 12.X + +### libsdformat 12.0.0 (202X-XX-XX) + ## libsdformat 11.X ### libsdformat 11.X.X (202X-XX-XX) diff --git a/README.md b/README.md index 60c03f28b..19614df8e 100644 --- a/README.md +++ b/README.md @@ -80,9 +80,9 @@ conda install libsdformat=9.3.0 --channel conda-forge ## Source Installation -**Note:** the `master` branch is under development for `libsdformat11` and is -currently unstable. A release branch (`sdf10`, `sdf9`, etc.) is recommended -for most users. +**Note:** the `main` branch is under development for `libsdformat12` and is +currently unstable. A release branch (`sdf11`, `sdf10`, `sdf9`, etc.) is +recommended for most users. ## UNIX diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 07d02a830..41d58c80f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) -find_package(sdformat11 REQUIRED) +find_package(sdformat12 REQUIRED) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")