diff options
| author | Tomas Rezucha <tomas.rezucha@espressif.com> | 2024-08-09 06:29:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-09 12:29:22 +0800 |
| commit | 8699a7e86e18fdb09bb2d72e35c75bdedc539b14 (patch) | |
| tree | 2ac3f79595db3d1b805d3ac842d788a458393018 | |
| parent | 6264265715aa40a659c279ee61ba7d7461731fc1 (diff) | |
| download | lvgl-8699a7e86e18fdb09bb2d72e35c75bdedc539b14.tar.gz lvgl-8699a7e86e18fdb09bb2d72e35c75bdedc539b14.zip | |
feat(cmake): Make LVGL version available for all CMake environments (#6654)
| -rw-r--r-- | env_support/cmake/custom.cmake | 7 | ||||
| -rw-r--r-- | env_support/cmake/esp.cmake | 2 | ||||
| -rw-r--r-- | env_support/cmake/micropython.cmake | 2 | ||||
| -rw-r--r-- | env_support/cmake/version.cmake | 8 | ||||
| -rw-r--r-- | env_support/cmake/zephyr.cmake | 1 |
5 files changed, 14 insertions, 6 deletions
diff --git a/env_support/cmake/custom.cmake b/env_support/cmake/custom.cmake index a95362f25..b7a603630 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 694ffd3ac..4983677ad 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 4619ee297..207e6d903 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 000000000..ad819e713 --- /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 7ab4654fb..826810ddc 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) |