after release cleanup #563

eclipse-sumo · Feb 4, 2025 · dea1a17 · dea1a17
1 parent 7fcd749
commit dea1a17
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ endif ()
 
 cmake_minimum_required(VERSION 3.5)
 project("${PROJECT_NAME}" CXX C)
-set(PACKAGE_VERSION "1.22.0")
+set(PACKAGE_VERSION "git")
 
 # Check if libraries have to be found, depending on SUMO_LIBRARIES
 set(SUMO_LIBRARIES "$ENV{SUMO_LIBRARIES}" CACHE PATH "Location of SUMOLibraries dependencies")

diff --git a/docs/web/docs/ChangeLog.md b/docs/web/docs/ChangeLog.md
@@ -2,6 +2,11 @@
 title: ChangeLog
 ---
 
+## Git Main
+
+### Bugfixes
+
+
 ## Version 1.22.0 (04.02.2025)
 
 ### Bugfixes
@@ -18,7 +23,7 @@ title: ChangeLog
   - Fixed blocked vehicles at busStop with attribute parkingLength #15644
   - Fixed train collision at rail_crossing #15658
   - Fixed crash when route contains internal edge #15667
-  - Fixed invalid error when using jump after stopping twice on the same edge #15635  
+  - Fixed invalid error when using jump after stopping twice on the same edge #15635
   - Fixed invalid value of diagnostic param 'caccVehicleMode' when using carFollowModel *CACC* #15682
   - Fixed invalid speedErr computation for carFollowModel *CACC* #15683
   - Actuated traffic light that use the `next` attribute to skip phases now work correctly if the targeted green phase serves no traffic but leads to a subsequent phase which does #15716

diff --git a/src/config.h.cmake b/src/config.h.cmake
@@ -208,7 +208,7 @@
 #cmakedefine HAVE_PYTHON
 
 /* Define if auto-generated version.h should be used. */
-//#define HAVE_VERSION_H
+#define HAVE_VERSION_H
 #ifndef HAVE_VERSION_H
     /* Define if auto-generated version.h is unavailable. */
     #define VERSION_STRING "1.22.0"