diff options
| author | Andrey Davydov <andrey.a.davydov@gmail.com> | 2017-06-21 08:25:36 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-06-28 12:06:41 +0200 |
| commit | 22de81e6ccc68772ef6ba6a76268669a443d8e96 (patch) | |
| tree | 0ad4ca120d98cd055ab1531f73fef1086c77f6f2 | |
| parent | 6b2133b4e9f7f17844254d333428e7367c71fe37 (diff) | |
| download | libgit2-22de81e6ccc68772ef6ba6a76268669a443d8e96.tar.gz | |
cmake: use `target_include_directories` for modern cmake
Apply `target_include_directories` when CMAKE_VERSION >= 2.8.12
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d3f5a995c..82e086d59 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,13 @@ 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) + SET(LIBGIT2_INNER_DIRECTORIES_ARE_INCLUDED TRUE) +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) @@ -688,6 +694,10 @@ IF (BUILD_CLAR) ${CLAR_PATH}/clar.c PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clar.suite) + IF (NOT LIBGIT2_INNER_DIRECTORIES_ARE_INCLUDED) + INCLUDE_DIRECTORIES(src include) + ENDIF() + ADD_EXECUTABLE(libgit2_clar ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1}) TARGET_LINK_LIBRARIES(libgit2_clar ${COREFOUNDATION_DIRS}) |