diff options
| author | Veeti Paananen <veeti.paananen@rojekti.fi> | 2012-10-19 17:33:13 +0300 |
|---|---|---|
| committer | Veeti Paananen <veeti.paananen@rojekti.fi> | 2012-10-20 02:56:35 +0300 |
| commit | 9795a40f886db0e9b700252e08d34d0b37ff8ecb (patch) | |
| tree | a0b69fd0a335a613eadd87c50a068195a8984c42 | |
| parent | 350b83b67d6dfc7f5cff5065aa0cf46f2bc00468 (diff) | |
| download | libgit2-9795a40f886db0e9b700252e08d34d0b37ff8ecb.tar.gz | |
Use standard CMake variable names for installation paths
Rename INSTALL_INC and INSTALL_BIN to INCLUDE_INSTALL_DIR and
BIN_INSTALL_DIR, which are more commonly used. This is also
consistent with the variable for the library path which is
already LIB_INSTALL_DIR.
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | libgit2.pc.in | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 52929062d..4fb8eba56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,9 +66,9 @@ ELSE (ZLIB_FOUND) ENDIF() # Installation paths -SET(INSTALL_BIN bin CACHE PATH "Where to install binaries to.") +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(INSTALL_INC include CACHE PATH "Where to install headers to.") +SET(INCLUDE_INSTALL_DIR include CACHE PATH "Where to install headers to.") # Build options OPTION (BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON) @@ -170,13 +170,13 @@ ENDIF() # Install INSTALL(TARGETS git2 - RUNTIME DESTINATION ${INSTALL_BIN} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgit2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) -INSTALL(DIRECTORY include/git2 DESTINATION ${INSTALL_INC} ) -INSTALL(FILES include/git2.h DESTINATION ${INSTALL_INC} ) +INSTALL(DIRECTORY include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} ) +INSTALL(FILES include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} ) # Tests IF (BUILD_CLAR) @@ -66,9 +66,9 @@ For more advanced use or questions about CMake please read <http://www.cmake.org The following CMake variables are declared: -- `INSTALL_BIN`: Where to install binaries to. +- `BIN_INSTALL_DIR`: Where to install binaries to. - `LIB_INSTALL_DIR`: Where to install libraries to. -- `INSTALL_INC`: Where to install headers to. +- `INCLUDE_INSTALL_DIR`: Where to install headers to. - `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON) - `BUILD_CLAR`: Build [Clar](https://github.com/tanoku/clar)-based test suite (defaults to ON) - `THREADSAFE`: Build libgit2 with threading support (defaults to OFF) diff --git a/libgit2.pc.in b/libgit2.pc.in index ddc03f36b..52ad901f7 100644 --- a/libgit2.pc.in +++ b/libgit2.pc.in @@ -1,5 +1,5 @@ libdir=@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/@INSTALL_INC@ +includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ Name: libgit2 Description: The git library, take 2 |