diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-03-21 16:49:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-21 16:49:44 +0000 |
| commit | 9a1024465cf3650d513d3e997435683fcf518e2b (patch) | |
| tree | d4ef4a56e1ececd2faee91667ed732eb11dc91a3 | |
| parent | 44372ce53a9ea0d98b214eb76503601dfc06a199 (diff) | |
| parent | 87fc539f2ee733f86a83339a50aa3072d71890ef (diff) | |
| download | libgit2-9a1024465cf3650d513d3e997435683fcf518e2b.tar.gz | |
Merge pull request #5455 from pks-t/pks/cmake-install-dirs
cmake: use install directories provided via GNUInstallDirs
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | cmake/Modules/PkgBuildConfig.cmake | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 16 |
4 files changed, 12 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 113e554d2..826415893 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,7 @@ INCLUDE(AddCFlagIfSupported) INCLUDE(FindPkgLibraries) INCLUDE(FindThreads) INCLUDE(FindStatNsec) +INCLUDE(GNUInstallDirs) INCLUDE(IdeSplitSources) INCLUDE(FeatureSummary) INCLUDE(EnableWarnings) @@ -247,9 +247,9 @@ For more advanced use or questions about CMake please read <https://cmake.org/Wi The following CMake variables are declared: -- `BIN_INSTALL_DIR`: Where to install binaries to. -- `LIB_INSTALL_DIR`: Where to install libraries to. -- `INCLUDE_INSTALL_DIR`: Where to install headers to. +- `CMAKE_INSTALL_BINDIR`: Where to install binaries to. +- `CMAKE_INSTALL_LIBDIR`: Where to install libraries to. +- `CMAKE_INSTALL_INCLUDEDIR`: Where to install headers to. - `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON) - `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON) - `THREADSAFE`: Build libgit2 with threading support (defaults to ON) diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/Modules/PkgBuildConfig.cmake index e4c574431..54c5e294c 100644 --- a/cmake/Modules/PkgBuildConfig.cmake +++ b/cmake/Modules/PkgBuildConfig.cmake @@ -27,8 +27,8 @@ function(pkg_build_config) # Write .pc "header" file(WRITE "${PKGCONFIG_FILE}" "prefix=\"${CMAKE_INSTALL_PREFIX}\"\n" - "libdir=\"${LIB_INSTALL_DIR}\"\n" - "includedir=\"${INCLUDE_INSTALL_DIR}\"\n" + "libdir=\"${CMAKE_INSTALL_FULL_LIBDIR}\"\n" + "includedir=\"${CMAKE_INSTALL_FULL_INCLUDEDIR}\"\n" "\n" "Name: ${PKGCONFIG_NAME}\n" "Description: ${PKGCONFIG_DESCRIPTION}\n" @@ -73,7 +73,5 @@ function(pkg_build_config) file(APPEND "${PKGCONFIG_FILE}" "Cflags: -I\${includedir} ${PKGCONFIG_CFLAGS}\n") # Install .pc file - install(FILES "${PKGCONFIG_FILE}" - DESTINATION "${LIB_INSTALL_DIR}/pkgconfig" - ) + install(FILES "${PKGCONFIG_FILE}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") endfunction() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3dfb69ceb..dff1d94e8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,12 +21,6 @@ SET(LIBGIT2_INCLUDES SET(LIBGIT2_SYSTEM_INCLUDES "") SET(LIBGIT2_LIBS "") -# Installation paths -# -SET(BIN_INSTALL_DIR bin CACHE PATH "Where to install binaries to.") -SET(LIB_INSTALL_DIR lib CACHE PATH "Where to install libraries to.") -SET(INCLUDE_INSTALL_DIR include CACHE PATH "Where to install headers to.") - # Enable tracing IF(ENABLE_TRACE) SET(GIT_TRACE 1) @@ -391,9 +385,9 @@ ENDIF () # Install INSTALL(TARGETS git2 - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} ) -INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} ) +INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |