@@ -99,26 +99,25 @@ if("${INC_INSTALL_DIR}" STREQUAL "")
99
99
set (INC_INSTALL_DIR "include/lvgl" )
100
100
endif ()
101
101
102
- set (CMAKE_INSTALL_PREFIX . )
103
102
104
103
#Install headers
105
104
install (
106
105
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} /src"
107
- DESTINATION "${CMAKE_INSTALL_PREFIX} / ${ INC_INSTALL_DIR}/ "
106
+ DESTINATION "${INC_INSTALL_DIR} "
108
107
FILES_MATCHING
109
108
PATTERN "*.h" )
110
109
111
110
# Install headers from the LVGL_PUBLIC_HEADERS variable
112
111
install (
113
112
FILES ${LVGL_PUBLIC_HEADERS}
114
- DESTINATION "${CMAKE_INSTALL_PREFIX} / ${ INC_INSTALL_DIR} /"
113
+ DESTINATION "${INC_INSTALL_DIR} /"
115
114
)
116
115
117
116
# install example headers
118
117
if (NOT LV_CONF_BUILD_DISABLE_EXAMPLES )
119
118
install (
120
119
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} /examples"
121
- DESTINATION "${CMAKE_INSTALL_PREFIX} / ${ INC_INSTALL_DIR}/ "
120
+ DESTINATION "${INC_INSTALL_DIR} "
122
121
FILES_MATCHING
123
122
PATTERN "*.h" )
124
123
endif ()
@@ -127,7 +126,7 @@ endif()
127
126
if (NOT LV_CONF_BUILD_DISABLE_DEMOS )
128
127
install (
129
128
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} /demos"
130
- DESTINATION "${CMAKE_INSTALL_PREFIX} / ${ INC_INSTALL_DIR}/ "
129
+ DESTINATION "${INC_INSTALL_DIR} "
131
130
FILES_MATCHING
132
131
PATTERN "*.h" )
133
132
endif ()
@@ -138,17 +137,16 @@ configure_file("${LVGL_ROOT_DIR}/lv_version.h.in" ${CMAKE_CURRENT_BINARY_DIR}/lv
138
137
139
138
install (
140
139
FILES "${CMAKE_CURRENT_BINARY_DIR} /lvgl.pc"
141
- DESTINATION "${LIB_INSTALL_DIR} /pkgconfig/" )
140
+ DESTINATION "share /pkgconfig/" )
142
141
143
142
# Install library
144
143
set_target_properties (
145
144
lvgl
146
145
PROPERTIES OUTPUT_NAME lvgl
147
146
VERSION ${LVGL_VERSION}
148
147
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"
152
150
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS} " )
153
151
154
152
install (
@@ -166,9 +164,8 @@ if(NOT LV_CONF_BUILD_DISABLE_THORVG_INTERNAL)
166
164
PROPERTIES OUTPUT_NAME lvgl_thorvg
167
165
VERSION ${LVGL_VERSION}
168
166
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"
172
169
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS} " )
173
170
174
171
install (
@@ -186,9 +183,8 @@ if(NOT LV_CONF_BUILD_DISABLE_DEMOS)
186
183
PROPERTIES OUTPUT_NAME lvgl_demos
187
184
VERSION ${LVGL_VERSION}
188
185
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"
192
188
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS} " )
193
189
194
190
install (
@@ -206,9 +202,8 @@ if(NOT LV_CONF_BUILD_DISABLE_EXAMPLES)
206
202
PROPERTIES OUTPUT_NAME lvgl_examples
207
203
VERSION ${LVGL_VERSION}
208
204
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"
212
207
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS} " )
213
208
214
209
install (
0 commit comments