chore: review comments

move cpack version closer to where it's used

CMakeLists.txt

@@ -39,20 +39,6 @@ configure_file(
   @ONLY
 )
 
-if(NOT CPACK_PACKAGE_VERSION)
-  set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-    set(SEM_VER "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-    if(NOT DEFINED PROJECT_VERSION_TWEAK)
-        set(CPACK_PACKAGE_VERSION ${SEM_VER})
-    elseif(PROJECT_VERSION_TWEAK EQUAL 0)
-        set(CPACK_PACKAGE_VERSION "${SEM_VER}~dev-1")
-    elseif(PROJECT_VERSION_TWEAK GREATER 0)
-        set(CPACK_PACKAGE_VERSION "${SEM_VER}~pre.${PROJECT_VERSION_TWEAK}-1")
-    endif()
-endif()
-
-
-
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
@@ -507,6 +493,7 @@ endif()
 
 # For packaging
 if(PACKAGING)
+
   set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages")
 
   set(CPACK_COMPONENTS_ALL Runtime Headers Dev)
@@ -519,9 +506,17 @@ if(PACKAGING)
 
   set(CPACK_PACKAGE_CHECKSUM MD5)
   set(CPACK_PACKAGE_VENDOR "The Eclipse Foundation")
-  set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-  set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-  set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+  if(NOT CPACK_PACKAGE_VERSION)
+    set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+      set(SEM_VER "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+      if(NOT DEFINED PROJECT_VERSION_TWEAK)
+          set(CPACK_PACKAGE_VERSION ${SEM_VER})
+      elseif(PROJECT_VERSION_TWEAK EQUAL 0)
+          set(CPACK_PACKAGE_VERSION "${SEM_VER}~dev-1")
+      elseif(PROJECT_VERSION_TWEAK GREATER 0)
+          set(CPACK_PACKAGE_VERSION "${SEM_VER}~pre.${PROJECT_VERSION_TWEAK}-1")
+      endif()
+  endif()
   set(CPACK_COMPONENT_RUNTIME_DESCRIPTION "The C client library for Eclipse zenoh targeting pico devices")
   set(CPACK_COMPONENT_HEADERS_DESCRIPTION "${CPACK_COMPONENT_LIB_DESCRIPTION} - headers")
   set(CPACK_COMPONENT_DEV_DESCRIPTION "${CPACK_COMPONENT_LIB_DESCRIPTION} - config files")