Skip to content

Commit 3cfe1a8

Browse files
authored
fix(cmake): fix installation with cmake --install (lvgl#7161)
1 parent 0091be4 commit 3cfe1a8

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

env_support/cmake/custom.cmake

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,25 @@ if("${INC_INSTALL_DIR}" STREQUAL "")
9999
set(INC_INSTALL_DIR "include/lvgl")
100100
endif()
101101

102-
set(CMAKE_INSTALL_PREFIX .)
103102

104103
#Install headers
105104
install(
106105
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src"
107-
DESTINATION "${CMAKE_INSTALL_PREFIX}/${INC_INSTALL_DIR}/"
106+
DESTINATION "${INC_INSTALL_DIR}"
108107
FILES_MATCHING
109108
PATTERN "*.h")
110109

111110
# Install headers from the LVGL_PUBLIC_HEADERS variable
112111
install(
113112
FILES ${LVGL_PUBLIC_HEADERS}
114-
DESTINATION "${CMAKE_INSTALL_PREFIX}/${INC_INSTALL_DIR}/"
113+
DESTINATION "${INC_INSTALL_DIR}/"
115114
)
116115

117116
# install example headers
118117
if(NOT LV_CONF_BUILD_DISABLE_EXAMPLES)
119118
install(
120119
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/examples"
121-
DESTINATION "${CMAKE_INSTALL_PREFIX}/${INC_INSTALL_DIR}/"
120+
DESTINATION "${INC_INSTALL_DIR}"
122121
FILES_MATCHING
123122
PATTERN "*.h")
124123
endif()
@@ -127,7 +126,7 @@ endif()
127126
if(NOT LV_CONF_BUILD_DISABLE_DEMOS)
128127
install(
129128
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/demos"
130-
DESTINATION "${CMAKE_INSTALL_PREFIX}/${INC_INSTALL_DIR}/"
129+
DESTINATION "${INC_INSTALL_DIR}"
131130
FILES_MATCHING
132131
PATTERN "*.h")
133132
endif()
@@ -138,17 +137,16 @@ configure_file("${LVGL_ROOT_DIR}/lv_version.h.in" ${CMAKE_CURRENT_BINARY_DIR}/lv
138137

139138
install(
140139
FILES "${CMAKE_CURRENT_BINARY_DIR}/lvgl.pc"
141-
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig/")
140+
DESTINATION "share/pkgconfig/")
142141

143142
# Install library
144143
set_target_properties(
145144
lvgl
146145
PROPERTIES OUTPUT_NAME lvgl
147146
VERSION ${LVGL_VERSION}
148147
SOVERSION ${LVGL_SOVERSION}
149-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
150-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
151-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
148+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
149+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
152150
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS}")
153151

154152
install(
@@ -166,9 +164,8 @@ if(NOT LV_CONF_BUILD_DISABLE_THORVG_INTERNAL)
166164
PROPERTIES OUTPUT_NAME lvgl_thorvg
167165
VERSION ${LVGL_VERSION}
168166
SOVERSION ${LVGL_SOVERSION}
169-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
170-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
171-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
167+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
168+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
172169
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS}")
173170

174171
install(
@@ -186,9 +183,8 @@ if(NOT LV_CONF_BUILD_DISABLE_DEMOS)
186183
PROPERTIES OUTPUT_NAME lvgl_demos
187184
VERSION ${LVGL_VERSION}
188185
SOVERSION ${LVGL_SOVERSION}
189-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
190-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
191-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
186+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
187+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
192188
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS}")
193189

194190
install(
@@ -206,9 +202,8 @@ if(NOT LV_CONF_BUILD_DISABLE_EXAMPLES)
206202
PROPERTIES OUTPUT_NAME lvgl_examples
207203
VERSION ${LVGL_VERSION}
208204
SOVERSION ${LVGL_SOVERSION}
209-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
210-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
211-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
205+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
206+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
212207
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS}")
213208

214209
install(

0 commit comments

Comments
 (0)