Moved firmware filename generation to top level and updated configurator build to use firmware name from top-level cmake

Author: visrealm

.vscode/settings.json

@@ -16,6 +16,10 @@
     "cmake.configureOnOpen": false,
     "cmake.generator": "Ninja",
     "cmake.cmakePath": "${userHome}/.pico-sdk/cmake/v3.31.5/bin/cmake",
+    "cmake.additionalKits": [],
+    "cmake.environment": {
+        "PATH": "${userHome}/.pico-sdk/ninja/v1.12.1;${env:PATH}"
+    },
     "cmake.configureArgs": [
         "-DPICO9918_SCART_RGBS=OFF",
         "-DPICO9918_SCART_PAL=OFF", 

CMakeLists.txt

@@ -70,6 +70,42 @@ add_definitions(-DPICO_FLASH_SPI_CLKDIV=4)      # This could be 2, but then we c
 add_definitions(-DPICO_XOSC_STARTUP_DELAY_MULTIPLIER=8)
 
 
+# set up variables for the build process
+
+execute_process(
+    COMMAND git symbolic-ref --short HEAD
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE PICO9918_GIT_BRANCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+if (PICO9918_SCART_RGBS)
+  if (PICO9918_SCART_PAL)
+    set(PICO9918_OUTPUT_STR "rgbs-pal576i")
+  else()
+    set(PICO9918_OUTPUT_STR "rgbs-ntsc480i")
+  endif()
+else()
+  set(PICO9918_OUTPUT_STR "vga")
+endif()
+
+set(PICO9918_VERSION  "${PICO9918_MAJOR_VER}.${PICO9918_MINOR_VER}.${PICO9918_PATCH_VER}")
+string(REPLACE "." "-" PICO9918_VERSION_STR "${PICO9918_VERSION}")
+
+if (NOT ${PICO_BOARD} STREQUAL "pico9918")
+  set(PICO_BOARD_STR -${PICO_BOARD})
+endif()
+
+set(PICO9918_BINARY_SUFFIX ${PICO_BOARD_STR}-${PICO9918_OUTPUT_STR}-build-v${PICO9918_VERSION_STR})
+
+if (PICO9918_DIAG)
+  set(PICO9918_BINARY_SUFFIX ${PICO9918_BINARY_SUFFIX}-diag)
+endif()
+
+set(FIRMWARE_FILE pico9918${PICO9918_BINARY_SUFFIX})
+
+
+
 if(CONFIGURATOR_ONLY)
     add_subdirectory(configtool)
 else()

configtool/CMakeLists.txt

@@ -18,7 +18,7 @@ set(FRIENDLYVER "${PICO9918_VERSION}")
 setup_cvbasic_tools()
 
 # Firmware dependency (checked at build time, not configure time)
-set(FIRMWARE_FILE "${CMAKE_BINARY_DIR}/dist/pico9918-vga-build-${VERSION}.uf2")
+set(FIRMWARE_PATH "${CMAKE_BINARY_DIR}/dist/${FIRMWARE_FILE}.uf2")
 if(NOT CONFIGURATOR_ONLY)
     set(FIRMWARE_TARGET "firmware")  # Target that builds the firmware
 else()
@@ -33,8 +33,8 @@ function(convert_uf2_to_cvbasic BANK_SIZE OUTPUT_PREFIX)
         COMMAND ${PYTHON} "${CMAKE_SOURCE_DIR}/configtool/tools/uf2cvb.py" 
                 -b ${BANK_SIZE} 
                 -o "${OUTPUT_DIR}/${OUTPUT_PREFIX}" 
-                "${FIRMWARE_FILE}"
-        DEPENDS "${CMAKE_SOURCE_DIR}/configtool/tools/uf2cvb.py" "${FIRMWARE_FILE}"
+                "${FIRMWARE_PATH}"
+        DEPENDS "${CMAKE_SOURCE_DIR}/configtool/tools/uf2cvb.py" "${FIRMWARE_PATH}"
         COMMENT "Converting UF2 to CVBasic data (${BANK_SIZE}KB banks)"
         VERBATIM
     )
@@ -197,4 +197,4 @@ if(XAS99_SCRIPT)
 else()
     message(STATUS "XAS99: NOT FOUND (TI-99 builds will be limited)")
 endif()
-message(STATUS "Firmware: ${FIRMWARE_FILE}")
+message(STATUS "Firmware: ${FIRMWARE_PATH}")

src/CMakeLists.txt

@@ -8,39 +8,7 @@ cmake_minimum_required(VERSION 3.13)
 # end compile-time options
 
 
-# set up variables for the build process
-
-execute_process(
-    COMMAND git symbolic-ref --short HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE PICO9918_GIT_BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-if (PICO9918_SCART_RGBS)
-  if (PICO9918_SCART_PAL)
-    set(PICO9918_OUTPUT_STR "rgbs-pal576i")
-  else()
-    set(PICO9918_OUTPUT_STR "rgbs-ntsc480i")
-  endif()
-else()
-  set(PICO9918_OUTPUT_STR "vga")
-endif()
-
-set(PICO9918_VERSION  "${PICO9918_MAJOR_VER}.${PICO9918_MINOR_VER}.${PICO9918_PATCH_VER}")
-string(REPLACE "." "-" PICO9918_VERSION_STR "${PICO9918_VERSION}")
-
-if (NOT ${PICO_BOARD} STREQUAL "pico9918")
-  set(PICO_BOARD_STR -${PICO_BOARD})
-endif()
-
-set(PICO9918_BINARY_SUFFIX ${PICO_BOARD_STR}-${PICO9918_OUTPUT_STR}-build-v${PICO9918_VERSION_STR})
-
-if (PICO9918_DIAG)
-  set(PICO9918_BINARY_SUFFIX ${PICO9918_BINARY_SUFFIX}-diag)
-endif()
-
-set(PROGRAM pico9918${PICO9918_BINARY_SUFFIX})
+set(PROGRAM ${FIRMWARE_FILE})
 
 add_executable(${PROGRAM} )