diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-06-28 12:26:04 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-06-28 12:26:04 +0200 |
| commit | c26ce78404b7fc7356c56bd2c57611fd60a3705b (patch) | |
| tree | 0b40687939bbb9ce52241d14941ac9c9b470db20 | |
| parent | f5f13b50ad07a2cf6829638aef4680c72b3a4f08 (diff) | |
| parent | 56893bb9a1c759d2b1670a1e15d0f45ae35b51db (diff) | |
| download | libgit2-c26ce78404b7fc7356c56bd2c57611fd60a3705b.tar.gz | |
Merge branch 'AndreyG/cmake/modernization'
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d3f5a995c..f3b360494 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,6 @@ FILE(STRINGS "include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBG STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION ([0-9]+)$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}") # Find required dependencies -INCLUDE_DIRECTORIES(src include) IF (SECURITY_FOUND) # OS X 10.7 and older do not have some functions we use, fall back to OpenSSL there @@ -619,6 +618,12 @@ TARGET_LINK_LIBRARIES(git2 ${GSSAPI_LIBRARIES}) TARGET_LINK_LIBRARIES(git2 ${ICONV_LIBRARIES}) TARGET_OS_LIBRARIES(git2) +IF (${CMAKE_VERSION} VERSION_LESS 2.8.12) + INCLUDE_DIRECTORIES(src include) +ELSE() + TARGET_INCLUDE_DIRECTORIES(git2 PRIVATE src PUBLIC include) +ENDIF() + # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240) # Win64+MSVC+static libs = linker error IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS) @@ -690,6 +695,10 @@ IF (BUILD_CLAR) ADD_EXECUTABLE(libgit2_clar ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1}) + IF (${CMAKE_VERSION} VERSION_GREATER 2.8.11) + TARGET_INCLUDE_DIRECTORIES(libgit2_clar PRIVATE src PUBLIC include) + ENDIF() + TARGET_LINK_LIBRARIES(libgit2_clar ${COREFOUNDATION_DIRS}) TARGET_LINK_LIBRARIES(libgit2_clar ${SECURITY_DIRS}) TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES}) |