Cleanup CMake Version handling. cherry-pick:main

tyler-gilbert · tyler-gilbert · commit c5bca84d5dee · 2022-10-29T17:20:28.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,8 @@
 cmake_minimum_required (VERSION 3.12)
 cmsdk2_minimum_required(2.1.2)
-set(API_PROJECT_VERSION 1.6.4 CACHE INTERNAL "API version")
 project(API
 	LANGUAGES CXX C
-	VERSION ${API_PROJECT_VERSION})
+	VERSION 1.6.4)
 add_subdirectory(libraries/API API)
 add_subdirectory(libraries/VarAPI VarAPI)
 add_subdirectory(libraries/PrinterAPI PrinterAPI)
diff --git a/libraries/API.cmake b/libraries/API.cmake
@@ -93,6 +93,11 @@ function(api2_add_library)
   if(ARGS_TARGETS)
     set(${ARGS_TARGETS} ${TARGET_LIST} PARENT_SCOPE)
   endif()
+  if(ARGS_VERSION)
+    set(${ARGS_NAME}_VERSION ${ARGS_VERSION} CACHE INTERNAL "Set ${ARGS_NAME}_VERSION")
+  else()
+    set(${ARGS_NAME}_VERSION ${PROJECT_VERSION} CACHE INTERNAL "Set ${ARGS_NAME}_VERSION")
+  endif()
 endfunction()
 
 function(api_add_test_executable NAME RAM_SIZE DEPENDENCIES)
diff --git a/libraries/API/CMakeLists.txt b/libraries/API/CMakeLists.txt
@@ -2,6 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/api.cmake)
 
 api2_target(
   NAME API
+  VERSION ${PROJECT_VERSION}
   TARGETS TARGET_LIST)
 
 foreach(TARGET ${TARGET_LIST})
diff --git a/libraries/API/api.cmake b/libraries/API/api.cmake
@@ -90,8 +90,7 @@ function(api2_target)
   if(ARGS_TARGETS)
     set(${ARGS_TARGETS} ${RELEASE_TARGET_LIST} ${DEBUG_TARGET_LIST} PARENT_SCOPE)
   endif()
-  if(ARGS_VERSION)
-    set(${ARGS_NAME}_VERSION ${ARGS_VERSION} CACHE INTERNAL "Set ${ARGS_NAME}_VERSION")
-  endif()
+  set(${ARGS_NAME}_VERSION ${PROJECT_VERSION} CACHE INTERNAL "Set ${ARGS_NAME}_VERSION")
+  message(STATUS "  Set ${ARGS_NAME}_VERSION -> ${PROJECT_VERSION}")
 endfunction()
 
diff --git a/libraries/ChronoAPI/CMakeLists.txt b/libraries/ChronoAPI/CMakeLists.txt
@@ -2,5 +2,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/../API/api.cmake)
 
 api2_target(
 	NAME ChronoAPI
-	VERSION ${API_PROJECT_VERSION}
 	DEPENDENCIES PrinterAPI)
diff --git a/libraries/FsAPI/CMakeLists.txt b/libraries/FsAPI/CMakeLists.txt
@@ -2,5 +2,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/../API/api.cmake)
 
 api2_target(
   NAME FsAPI
-  VERSION ${API_PROJECT_VERSION}
   DEPENDENCIES ChronoAPI PrinterAPI)
diff --git a/libraries/PrinterAPI/CMakeLists.txt b/libraries/PrinterAPI/CMakeLists.txt
@@ -2,5 +2,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/../API/api.cmake)
 
 api2_target(
 	NAME PrinterAPI
-	VERSION ${API_PROJECT_VERSION}
 	DEPENDENCIES VarAPI)
diff --git a/libraries/SysAPI/CMakeLists.txt b/libraries/SysAPI/CMakeLists.txt
@@ -2,6 +2,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/../API/api.cmake)
 
 api2_target(
   NAME SysAPI
-  VERSION ${API_PROJECT_VERSION}
   DEPENDENCIES ThreadAPI FsAPI PrinterAPI VarAPI)
 
diff --git a/libraries/TestAPI/CMakeLists.txt b/libraries/TestAPI/CMakeLists.txt
@@ -2,6 +2,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/../API/api.cmake)
 
 api2_target(
 	NAME TestAPI
-	VERSION ${API_PROJECT_VERSION}
 	DEPENDENCIES ChronoAPI SysAPI)
 
diff --git a/libraries/ThreadAPI/CMakeLists.txt b/libraries/ThreadAPI/CMakeLists.txt
@@ -1,7 +1,6 @@
 include(${CMAKE_CURRENT_LIST_DIR}/../API/api.cmake)
 api2_target(
   NAME ThreadAPI
-  VERSION ${API_PROJECT_VERSION}
   TARGETS TARGET_LIST
   DEPENDENCIES FsAPI VarAPI ChronoAPI)
 
diff --git a/libraries/VarAPI/CMakeLists.txt b/libraries/VarAPI/CMakeLists.txt
@@ -2,7 +2,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/../API/api.cmake)
 
 api2_target(
   NAME VarAPI
-  VERSION ${API_PROJECT_VERSION}
   DEPENDENCIES API)
 
 if(${CMSDK_IS_LINK})
