Skip to content

Commit 42e270c

Browse files
[C++] Use GNUInstallDirs to install to the correct folders
1 parent c53857b commit 42e270c

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

lang/c++/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ if (AVRO_BUILD_TESTS)
258258
endif ()
259259

260260
include (InstallRequiredSystemLibraries)
261+
include (GNUInstallDirs)
261262

262263
set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
263264

@@ -268,13 +269,13 @@ install (TARGETS ${AVRO_INSTALL_LIBS}
268269
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
269270
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
270271
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
271-
INCLUDES DESTINATION include)
272+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
272273

273274
if (AVRO_BUILD_EXECUTABLES)
274275
install (TARGETS avrogencpp EXPORT avrocpp_targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
275276
endif ()
276277

277-
install (DIRECTORY include/avro DESTINATION include
278+
install (DIRECTORY include/avro DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
278279
FILES_MATCHING PATTERN *.hh)
279280

280281
if (NOT CMAKE_BUILD_TYPE)
@@ -293,17 +294,17 @@ write_basic_package_version_file(
293294
configure_package_config_file(
294295
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/AvroConfig.cmake.in"
295296
"${CMAKE_CURRENT_BINARY_DIR}/AvroConfig.cmake"
296-
INSTALL_DESTINATION lib/cmake/Avro
297+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Avro
297298
)
298299

299300
install(EXPORT avrocpp_targets
300301
NAMESPACE Avro::
301-
DESTINATION lib/cmake/Avro
302+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Avro
302303
FILE "AvroTargets.cmake"
303304
)
304305

305306
install(FILES
306307
"${CMAKE_CURRENT_BINARY_DIR}/AvroConfig.cmake"
307308
"${CMAKE_CURRENT_BINARY_DIR}/AvroConfigVersion.cmake"
308-
DESTINATION lib/cmake/Avro
309+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Avro
309310
)

0 commit comments

Comments
 (0)