Browse Source

Changed publish.sh to update the CMake project version

Benoit Blanchon 5 years ago
parent
commit
9e354803de
3 changed files with 6 additions and 2 deletions
  1. 2 1
      CMakeLists.txt
  2. 3 0
      extras/scripts/publish.sh
  3. 1 1
      src/CMakeLists.txt

+ 2 - 1
CMakeLists.txt

@@ -3,7 +3,8 @@
 # MIT License
 
 cmake_minimum_required(VERSION 3.0)
-project(ArduinoJson)
+
+project(ArduinoJson VERSION 6.15.1)
 
 set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
 

+ 3 - 0
extras/scripts/publish.sh

@@ -19,6 +19,9 @@ update_version_in_source () {
 	sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md
 	rm CHANGELOG.md*~
 
+	sed -i~ -bE "s/(project\\s*\\(ArduinoJson\\s+VERSION\\s+).*?\\)/\\1$MAJOR.$MINOR.$REVISION)/" CMakeLists.txt
+	rm CMakeLists.json*~
+
 	sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json
 	rm library.json*~
 

+ 1 - 1
src/CMakeLists.txt

@@ -35,7 +35,7 @@ include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
         "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake"
     VERSION
-        6.15.0
+        ${PROJECT_VERSION}
     COMPATIBILITY
         SameMajorVersion
 )