Merge pull request #3 from mwinters-stuff/main

Added LiquidCrystalIO library to cmake.

Author: davetcc

cmakeProject/CMakeLists.txt

@@ -1,3 +1,5 @@
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 cmake_minimum_required(VERSION 3.26)
 
 include(pico_sdk_import.cmake)
@@ -22,4 +24,5 @@ IF(NOT DEFINED "ENV{TC_CMAKE_EXCLUDE_EXAMPLES}")
     add_subdirectory(nativeExamples/ControlAppOledKeyboardWifi)
     add_subdirectory(nativeExamples/UsingMatrixKeyboard)
     add_subdirectory(nativeExamples/UnicodeHandlerTest)
-ENDIF ()
+ENDIF ()
+

cmakeProject/libraries.cmake

@@ -11,10 +11,10 @@ include(FetchContent)
 # TcMenuLog
 # AdafruitGFXNativePort
 # SimpleCollections
+# LiquidCrystalIO
 
 
-#SET(TCMENU_BASE_GIT_REPO "https://github.com/mwinters-stuff")
-SET(TCMENU_BASE_GIT_REPO "https://github.com/TcMenu/")
+SET(TCMENU_BASE_GIT_REPO "https://github.com/TcMenu")
 
 # Fetch the TcMenu git repo
 FetchContent_Declare(
@@ -64,6 +64,14 @@ FetchContent_Declare(
     SOURCE_SUBDIR  cmake
 )
 
+# Fetch the LiquidCrystalIO git repo
+FetchContent_Declare(
+    LiquidCrystalIO
+    GIT_REPOSITORY ${TCMENU_BASE_GIT_REPO}/LiquidCrystalIO.git
+    GIT_TAG        main # Use a stable branch, tag, or commit hash
+    SOURCE_SUBDIR  cmake
+)
+
 # Fetch the SimpleCollections git repo
 FetchContent_Declare(
     SimpleCollections
@@ -72,6 +80,6 @@ FetchContent_Declare(
     SOURCE_SUBDIR  cmake
 )
 
-FetchContent_MakeAvailable(tcMenuLib IoAbstraction TaskManagerIO TcUnicodeHelper TcMenuLog AdafruitGFX SimpleCollections)
+FetchContent_MakeAvailable(tcMenuLib IoAbstraction TaskManagerIO TcUnicodeHelper TcMenuLog AdafruitGFX SimpleCollections LiquidCrystalIO)
 
 endfunction()

cmakeProject/pico_sdk_import.cmake

@@ -18,9 +18,20 @@ if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_P
     message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')")
 endif ()
 
+if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_TAG} AND (NOT PICO_SDK_FETCH_FROM_GIT_TAG))
+    set(PICO_SDK_FETCH_FROM_GIT_TAG $ENV{PICO_SDK_FETCH_FROM_GIT_TAG})
+    message("Using PICO_SDK_FETCH_FROM_GIT_TAG from environment ('${PICO_SDK_FETCH_FROM_GIT_TAG}')")
+endif ()
+
+if (PICO_SDK_FETCH_FROM_GIT AND NOT PICO_SDK_FETCH_FROM_GIT_TAG)
+  set(PICO_SDK_FETCH_FROM_GIT_TAG "master")
+  message("Using master as default value for PICO_SDK_FETCH_FROM_GIT_TAG")
+endif()
+
 set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK")
 set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of SDK from git if not otherwise locatable")
 set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK")
+set(PICO_SDK_FETCH_FROM_GIT_TAG "${PICO_SDK_FETCH_FROM_GIT_TAG}" CACHE FILEPATH "release tag for SDK")
 
 if (NOT PICO_SDK_PATH)
     if (PICO_SDK_FETCH_FROM_GIT)
@@ -34,14 +45,14 @@ if (NOT PICO_SDK_PATH)
             FetchContent_Declare(
                     pico_sdk
                     GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                    GIT_TAG master
+                    GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
                     GIT_SUBMODULES_RECURSE FALSE
             )
         else ()
             FetchContent_Declare(
                     pico_sdk
                     GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                    GIT_TAG master
+                    GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
             )
         endif ()