From 8b659fc9a2b55460950fe5b6e9534a2ff593f193 Mon Sep 17 00:00:00 2001 From: NicGrimpe <58112514+NicGrimpe@users.noreply.github.com> Date: Mon, 26 Aug 2024 06:31:12 -0400 Subject: [PATCH] fix(env_support/cmake): If LV_CONF_PATH is set, install the indicated config instead of the default one. (#6675) --- env_support/cmake/custom.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/env_support/cmake/custom.cmake b/env_support/cmake/custom.cmake index b7a603630..e4cd36376 100644 --- a/env_support/cmake/custom.cmake +++ b/env_support/cmake/custom.cmake @@ -80,8 +80,13 @@ file(GLOB LVGL_PUBLIC_HEADERS "${LVGL_ROOT_DIR}/lv_version.h") if(NOT LV_CONF_SKIP) - list(APPEND LVGL_PUBLIC_HEADERS - "${CMAKE_SOURCE_DIR}/lv_conf.h") + if (LV_CONF_PATH) + list(APPEND LVGL_PUBLIC_HEADERS + ${LV_CONF_PATH}) + else() + list(APPEND LVGL_PUBLIC_HEADERS + "${CMAKE_SOURCE_DIR}/lv_conf.h") + endif() endif() if("${LIB_INSTALL_DIR}" STREQUAL "") @@ -210,4 +215,4 @@ if(NOT LV_CONF_BUILD_DISABLE_EXAMPLES) LIBRARY DESTINATION "${LIB_INSTALL_DIR}" RUNTIME DESTINATION "${RUNTIME_INSTALL_DIR}" PUBLIC_HEADER DESTINATION "${INC_INSTALL_DIR}") -endif() \ No newline at end of file +endif()