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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 5 insertions, 11 deletions
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}) |