extract version into into version.cmake

Author: maximevince

CMakeLists.txt

@@ -19,11 +19,8 @@ set(CMAKE_C_FLAGS_RELEASE "-Os")
 set(CMAKE_CXX_FLAGS_RELEASE "-Os")
 set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s)
 
-# Define the application version
-set(APP_VERSION_MAJOR 1)
-set(APP_VERSION_MINOR 5)
-set(APP_VERSION_PATCH 99) # patch level 99 = work-in-progress for next release
-set(APP_VERSION_STRING "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}")
+# Include version definitions
+include(version.cmake)
 
 add_compile_options(
         ${CPU_OPTIONS}
@@ -188,21 +185,6 @@ add_executable(${PROJECT_NAME}
 
 tinyusb_target_add(${PROJECT_NAME})
 
-# Get the GIT SHA
-execute_process(
-        COMMAND git rev-parse --short HEAD
-        OUTPUT_VARIABLE GIT_SHA
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-target_compile_definitions(${PROJECT_NAME} PRIVATE -DGIT_SHA="${GIT_SHA}")
-
-target_compile_definitions(${PROJECT_NAME} PRIVATE -DAPP_VERSION_MAJOR=${APP_VERSION_MAJOR})
-target_compile_definitions(${PROJECT_NAME} PRIVATE -DAPP_VERSION_MINOR=${APP_VERSION_MINOR})
-target_compile_definitions(${PROJECT_NAME} PRIVATE -DAPP_VERSION_PATCH=${APP_VERSION_PATCH})
-target_compile_definitions(${PROJECT_NAME} PRIVATE -DAPP_VERSION="${APP_VERSION_STRING}")
-target_compile_definitions(${PROJECT_NAME} PRIVATE -DAPP_VERSION_FULL="${APP_VERSION_STRING}-${GIT_SHA}")
-
 target_link_libraries(${PROJECT_NAME}
         ${CPU_OPTIONS}
         -T${LINKER_SCRIPT}

src/config/tusb_config.h

@@ -76,7 +76,7 @@
 #endif
 
 #ifndef CFG_TUSB_DEBUG
-#define CFG_TUSB_DEBUG        1
+#define CFG_TUSB_DEBUG        0
 #endif
 
 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.

test/CMakeLists.txt

@@ -4,6 +4,9 @@ project(xlat_linux)
 # Define project root directory
 set(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
+# Include version definitions
+include(${PROJECT_ROOT}/version.cmake)
+
 # Set build type to Debug if not specified
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
@@ -81,23 +84,3 @@ target_compile_definitions(xlat_linux PRIVATE
     LV_CONF_PATH=${LV_CONF_PATH}
     LV_DRV_CONF_PATH=${LV_DRV_CONF_PATH}
 )
-
-# Add version information
-set(APP_VERSION_MAJOR 1)
-set(APP_VERSION_MINOR 0)
-set(APP_VERSION_PATCH 0)
-set(APP_VERSION_STRING "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}")
-
-# Get the GIT SHA
-execute_process(
-        COMMAND git rev-parse --short HEAD
-        OUTPUT_VARIABLE GIT_SHA
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-target_compile_definitions(xlat_linux PRIVATE
-    APP_VERSION_MAJOR=${APP_VERSION_MAJOR}
-    APP_VERSION_MINOR=${APP_VERSION_MINOR}
-    APP_VERSION_PATCH=${APP_VERSION_PATCH}
-    APP_VERSION_FULL="${APP_VERSION_STRING}-${GIT_SHA}"
-)

version.cmake

@@ -0,0 +1,22 @@
+# Define the application version
+set(APP_VERSION_MAJOR 1)
+set(APP_VERSION_MINOR 5)
+set(APP_VERSION_PATCH 99) # patch level 99 = work-in-progress for next release
+set(APP_VERSION_STRING "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}")
+
+# Get the GIT SHA
+execute_process(
+        COMMAND git rev-parse --short HEAD
+        OUTPUT_VARIABLE GIT_SHA
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Define version-related compile definitions
+add_definitions(
+        -DAPP_VERSION_MAJOR=${APP_VERSION_MAJOR}
+        -DAPP_VERSION_MINOR=${APP_VERSION_MINOR}
+        -DAPP_VERSION_PATCH=${APP_VERSION_PATCH}
+        -DAPP_VERSION="${APP_VERSION_STRING}"
+        -DAPP_VERSION_FULL="${APP_VERSION_STRING}-${GIT_SHA}"
+        -DGIT_SHA="${GIT_SHA}"
+)