Skip to content

Commit f41794d

Browse files
daneosdaneos
committed
cmake: fix installation dirs
1 parent ac4a46b commit f41794d

File tree

2 files changed

+52
-43
lines changed

2 files changed

+52
-43
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ PROJECT (CLICKHOUSE-CLIENT VERSION 2.5.1)
2626

2727
IF (UNIX)
2828
IF (NOT APPLE)
29+
include(GNUInstallDirs)
2930
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
3031
ENDIF ()
3132
SET (CMAKE_EXE_LINKER_FLAGS, "${CMAKE_EXE_LINKER_FLAGS} -lpthread")

‎clickhouse/CMakeLists.txt

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,14 @@ IF (WITH_OPENSSL)
102102
LIST(APPEND clickhouse-cpp-lib-src base/sslsocket.cpp)
103103
ENDIF ()
104104

105+
IF (NOT CMAKE_INSTALL_LIBDIR)
106+
SET (CMAKE_INSTALL_LIBDIR lib)
107+
ENDIF ()
108+
109+
IF (NOT CMAKE_INSTALL_INCLUDEDIR)
110+
SET (CMAKE_INSTALL_INCLUDEDIR include)
111+
ENDIF ()
112+
105113
ADD_LIBRARY (clickhouse-cpp-lib ${clickhouse-cpp-lib-src})
106114
SET_TARGET_PROPERTIES (clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX)
107115
TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
@@ -148,58 +156,58 @@ ENDIF ()
148156

149157

150158
INSTALL (TARGETS clickhouse-cpp-lib
151-
ARCHIVE DESTINATION lib
152-
LIBRARY DESTINATION lib
159+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
160+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
153161
)
154162

155163
# general
156-
INSTALL(FILES block.h DESTINATION include/clickhouse/)
157-
INSTALL(FILES client.h DESTINATION include/clickhouse/)
158-
INSTALL(FILES error_codes.h DESTINATION include/clickhouse/)
159-
INSTALL(FILES exceptions.h DESTINATION include/clickhouse/)
160-
INSTALL(FILES server_exception.h DESTINATION include/clickhouse/)
161-
INSTALL(FILES protocol.h DESTINATION include/clickhouse/)
162-
INSTALL(FILES query.h DESTINATION include/clickhouse/)
164+
INSTALL(FILES block.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/)
165+
INSTALL(FILES client.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/)
166+
INSTALL(FILES error_codes.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/)
167+
INSTALL(FILES exceptions.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/)
168+
INSTALL(FILES server_exception.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/)
169+
INSTALL(FILES protocol.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/)
170+
INSTALL(FILES query.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/)
163171

164172
# base
165-
INSTALL(FILES base/buffer.h DESTINATION include/clickhouse/base/)
166-
INSTALL(FILES base/compressed.h DESTINATION include/clickhouse/base/)
167-
INSTALL(FILES base/input.h DESTINATION include/clickhouse/base/)
168-
INSTALL(FILES base/open_telemetry.h DESTINATION include/clickhouse/base/)
169-
INSTALL(FILES base/output.h DESTINATION include/clickhouse/base/)
170-
INSTALL(FILES base/platform.h DESTINATION include/clickhouse/base/)
171-
INSTALL(FILES base/projected_iterator.h DESTINATION include/clickhouse/base/)
172-
INSTALL(FILES base/singleton.h DESTINATION include/clickhouse/base/)
173-
INSTALL(FILES base/socket.h DESTINATION include/clickhouse/base/)
174-
INSTALL(FILES base/string_utils.h DESTINATION include/clickhouse/base/)
175-
INSTALL(FILES base/string_view.h DESTINATION include/clickhouse/base/)
176-
INSTALL(FILES base/uuid.h DESTINATION include/clickhouse/base/)
177-
INSTALL(FILES base/wire_format.h DESTINATION include/clickhouse/base/)
178-
INSTALL(FILES base/endpoints_iterator.h DESTINATION include/clickhouse/base/)
173+
INSTALL(FILES base/buffer.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
174+
INSTALL(FILES base/compressed.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
175+
INSTALL(FILES base/input.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
176+
INSTALL(FILES base/open_telemetry.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
177+
INSTALL(FILES base/output.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
178+
INSTALL(FILES base/platform.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
179+
INSTALL(FILES base/projected_iterator.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
180+
INSTALL(FILES base/singleton.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
181+
INSTALL(FILES base/socket.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
182+
INSTALL(FILES base/string_utils.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
183+
INSTALL(FILES base/string_view.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
184+
INSTALL(FILES base/uuid.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
185+
INSTALL(FILES base/wire_format.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
186+
INSTALL(FILES base/endpoints_iterator.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/base/)
179187

180188
# columns
181-
INSTALL(FILES columns/array.h DESTINATION include/clickhouse/columns/)
182-
INSTALL(FILES columns/column.h DESTINATION include/clickhouse/columns/)
183-
INSTALL(FILES columns/date.h DESTINATION include/clickhouse/columns/)
184-
INSTALL(FILES columns/decimal.h DESTINATION include/clickhouse/columns/)
185-
INSTALL(FILES columns/enum.h DESTINATION include/clickhouse/columns/)
186-
INSTALL(FILES columns/factory.h DESTINATION include/clickhouse/columns/)
187-
INSTALL(FILES columns/geo.h DESTINATION include/clickhouse/columns/)
188-
INSTALL(FILES columns/ip4.h DESTINATION include/clickhouse/columns/)
189-
INSTALL(FILES columns/ip6.h DESTINATION include/clickhouse/columns/)
190-
INSTALL(FILES columns/itemview.h DESTINATION include/clickhouse/columns/)
191-
INSTALL(FILES columns/lowcardinality.h DESTINATION include/clickhouse/columns/)
192-
INSTALL(FILES columns/nullable.h DESTINATION include/clickhouse/columns/)
193-
INSTALL(FILES columns/numeric.h DESTINATION include/clickhouse/columns/)
194-
INSTALL(FILES columns/map.h DESTINATION include/clickhouse/columns/)
195-
INSTALL(FILES columns/string.h DESTINATION include/clickhouse/columns/)
196-
INSTALL(FILES columns/tuple.h DESTINATION include/clickhouse/columns/)
197-
INSTALL(FILES columns/utils.h DESTINATION include/clickhouse/columns/)
198-
INSTALL(FILES columns/uuid.h DESTINATION include/clickhouse/columns/)
189+
INSTALL(FILES columns/array.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
190+
INSTALL(FILES columns/column.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
191+
INSTALL(FILES columns/date.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
192+
INSTALL(FILES columns/decimal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
193+
INSTALL(FILES columns/enum.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
194+
INSTALL(FILES columns/factory.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
195+
INSTALL(FILES columns/geo.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
196+
INSTALL(FILES columns/ip4.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
197+
INSTALL(FILES columns/ip6.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
198+
INSTALL(FILES columns/itemview.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
199+
INSTALL(FILES columns/lowcardinality.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
200+
INSTALL(FILES columns/nullable.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
201+
INSTALL(FILES columns/numeric.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
202+
INSTALL(FILES columns/map.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
203+
INSTALL(FILES columns/string.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
204+
INSTALL(FILES columns/tuple.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
205+
INSTALL(FILES columns/utils.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
206+
INSTALL(FILES columns/uuid.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/columns/)
199207

200208
# types
201-
INSTALL(FILES types/type_parser.h DESTINATION include/clickhouse/types/)
202-
INSTALL(FILES types/types.h DESTINATION include/clickhouse/types/)
209+
INSTALL(FILES types/type_parser.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/types/)
210+
INSTALL(FILES types/types.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clickhouse/types/)
203211

204212
IF (WITH_OPENSSL)
205213
TARGET_LINK_LIBRARIES (clickhouse-cpp-lib OpenSSL::SSL)

0 commit comments

Comments
 (0)