Apply prerelease suffix (#3)

* Apply prerelease suffix Signed-off-by: Addisu Z. Taddese <[email protected]> * Use spdlog_vendor instead of spdlog, drop BUILD_DOCS Signed-off-by: Addisu Z. Taddese <[email protected]> --------- Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebo-release · Sep 10, 2024 · 5b90690 · 5b90690
1 parent b0a4abb
commit 5b90690
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,7 @@ project(gz_common_vendor)
 set(LIB_VER_MAJOR 6)
 set(LIB_VER_MINOR 0)
 set(LIB_VER_PATCH 0)
+set(LIB_VER_SUFFIX "-pre2")
 
 # Derived variables
 set(LIB_NAME gz-common)
@@ -22,6 +23,7 @@ find_package(ament_cmake_export_dependencies REQUIRED)
 find_package(gz_cmake_vendor REQUIRED)
 find_package(gz_math_vendor REQUIRED)
 find_package(gz_utils_vendor REQUIRED)
+find_package(spdlog_vendor REQUIRED)
 
 # Set the VERSION_MATCH to "EXACT" by default, but relax the requirement
 # if we are users are building from source (determined by the
@@ -41,9 +43,7 @@ find_package(${LIB_NAME_FULL} ${VERSION_MATCH} ${LIB_VER} COMPONENTS all QUIET)
 ament_vendor(${LIB_NAME_UNDERSCORE}_vendor
   SATISFIED ${${LIB_NAME_FULL}_FOUND}
   VCS_URL https://github.com/gazebosim/${GITHUB_NAME}.git
-  VCS_VERSION ${GITHUB_NAME}${LIB_VER_MAJOR}_${LIB_VER}
-  CMAKE_ARGS
-    -DBUILD_DOCS:BOOL=OFF
+  VCS_VERSION ${GITHUB_NAME}${LIB_VER_MAJOR}_${LIB_VER}${LIB_VER_SUFFIX}
   GLOBAL_HOOK
 )
 
@@ -62,6 +62,7 @@ ament_export_dependencies(
   gz_cmake_vendor
   gz_math_vendor
   gz_utils_vendor
+  spdlog_vendor
 )
 
 if(NOT ${${LIB_NAME_FULL}_FOUND})

diff --git a/package.xml b/package.xml
@@ -28,19 +28,18 @@
   <build_depend>ffmpeg-dev</build_depend>
   <build_depend>libfreeimage-dev</build_depend>
   <build_depend>libgdal-dev</build_depend>
-  <build_depend>spdlog</build_depend>
   <build_depend>tinyxml2</build_depend>
   <build_depend>uuid</build_depend>
   <exec_depend>assimp-dev</exec_depend>
   <exec_depend>ffmpeg-dev</exec_depend>
   <exec_depend>libfreeimage-dev</exec_depend>
   <exec_depend>libgdal-dev</exec_depend>
-  <exec_depend>spdlog</exec_depend>
   <exec_depend>tinyxml2</exec_depend>
   <exec_depend>uuid</exec_depend>
   <depend>gz_cmake_vendor</depend>
   <depend>gz_math_vendor</depend>
   <depend>gz_utils_vendor</depend>
+  <depend>spdlog_vendor</depend>
 
   <!-- Depend on the package we are vendoring to allow building it from source -->
   <depend condition="$GZ_BUILD_FROM_SOURCE != ''">gz-common6</depend>