From 8699a7e86e18fdb09bb2d72e35c75bdedc539b14 Mon Sep 17 00:00:00 2001 From: Tomas Rezucha Date: Fri, 9 Aug 2024 06:29:22 +0200 Subject: [PATCH] feat(cmake): Make LVGL version available for all CMake environments (#6654) --- env_support/cmake/custom.cmake | 7 +------ env_support/cmake/esp.cmake | 2 ++ env_support/cmake/micropython.cmake | 2 ++ env_support/cmake/version.cmake | 8 ++++++++ env_support/cmake/zephyr.cmake | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 env_support/cmake/version.cmake diff --git a/env_support/cmake/custom.cmake b/env_support/cmake/custom.cmake index a95362f253..b7a6036309 100644 --- a/env_support/cmake/custom.cmake +++ b/env_support/cmake/custom.cmake @@ -1,9 +1,4 @@ -set(LVGL_VERSION_MAJOR "9") -set(LVGL_VERSION_MINOR "1") -set(LVGL_VERSION_PATCH "1") -set(LVGL_VERSION_INFO "dev") -set(LVGL_VERSION ${LVGL_VERSION_MAJOR}.${LVGL_VERSION_MINOR}.${LVGL_VERSION_PATCH}) -set(LVGL_SOVERSION ${LVGL_VERSION_MAJOR}) +include("${CMAKE_CURRENT_LIST_DIR}/version.cmake") # Option to define LV_LVGL_H_INCLUDE_SIMPLE, default: ON option(LV_LVGL_H_INCLUDE_SIMPLE diff --git a/env_support/cmake/esp.cmake b/env_support/cmake/esp.cmake index 694ffd3acb..4983677adb 100644 --- a/env_support/cmake/esp.cmake +++ b/env_support/cmake/esp.cmake @@ -1,3 +1,5 @@ +include("${CMAKE_CURRENT_LIST_DIR}/version.cmake") + file(GLOB_RECURSE SOURCES ${LVGL_ROOT_DIR}/src/*.c ${LVGL_ROOT_DIR}/src/*.cpp) idf_build_get_property(LV_MICROPYTHON LV_MICROPYTHON) diff --git a/env_support/cmake/micropython.cmake b/env_support/cmake/micropython.cmake index 4619ee2979..207e6d903e 100644 --- a/env_support/cmake/micropython.cmake +++ b/env_support/cmake/micropython.cmake @@ -1,3 +1,5 @@ +include("${CMAKE_CURRENT_LIST_DIR}/version.cmake") + file(GLOB_RECURSE SOURCES ${LVGL_ROOT_DIR}/src/*.c) file(GLOB_RECURSE EXAMPLE_SOURCES ${LVGL_ROOT_DIR}/examples/*.c) diff --git a/env_support/cmake/version.cmake b/env_support/cmake/version.cmake new file mode 100644 index 0000000000..ad819e7132 --- /dev/null +++ b/env_support/cmake/version.cmake @@ -0,0 +1,8 @@ +set(LVGL_VERSION_MAJOR "9") +set(LVGL_VERSION_MINOR "1") +set(LVGL_VERSION_PATCH "1") +set(LVGL_VERSION_INFO "dev") + +set(LVGL_VERSION ${LVGL_VERSION_MAJOR}.${LVGL_VERSION_MINOR}.${LVGL_VERSION_PATCH}) # This is a CMake variable +set(ENV{LVGL_VERSION} ${LVGL_VERSION}) # This is exported Environmental variable +set(LVGL_SOVERSION ${LVGL_VERSION_MAJOR}) diff --git a/env_support/cmake/zephyr.cmake b/env_support/cmake/zephyr.cmake index 7ab4654fba..826810ddc6 100644 --- a/env_support/cmake/zephyr.cmake +++ b/env_support/cmake/zephyr.cmake @@ -1,4 +1,5 @@ if(CONFIG_LVGL) + include("${CMAKE_CURRENT_LIST_DIR}/version.cmake") zephyr_include_directories(${ZEPHYR_BASE}/lib/gui/lvgl)