File tree 1 file changed +11
-1
lines changed 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -206,7 +206,6 @@ FILE(STRINGS "include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBG
206
206
STRING (REGEX REPLACE "^.*LIBGIT2_SOVERSION ([0-9]+)$" "\\ 1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION} " )
207
207
208
208
# Find required dependencies
209
- INCLUDE_DIRECTORIES (src include )
210
209
211
210
IF (SECURITY_FOUND)
212
211
# OS X 10.7 and older do not have some functions we use, fall back to OpenSSL there
@@ -621,6 +620,13 @@ SET(LIBGIT2_LINK_DEPENDENCIES
621
620
TARGET_LINK_LIBRARIES (git2 ${LIBGIT2_LINK_DEPENDENCIES} )
622
621
TARGET_OS_LIBRARIES(git2)
623
622
623
+ IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
624
+ INCLUDE_DIRECTORIES (src include )
625
+ SET (LIBGIT2_INNER_DIRECTORIES_ARE_INCLUDED TRUE )
626
+ ELSE ()
627
+ TARGET_INCLUDE_DIRECTORIES (git2 PRIVATE src PUBLIC include )
628
+ ENDIF ()
629
+
624
630
# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
625
631
# Win64+MSVC+static libs = linker error
626
632
IF (MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS )
@@ -689,6 +695,10 @@ IF (BUILD_CLAR)
689
695
${CLAR_PATH} /clar.c
690
696
PROPERTIES OBJECT_DEPENDS ${CLAR_PATH} /clar.suite)
691
697
698
+ IF (NOT LIBGIT2_INNER_DIRECTORIES_ARE_INCLUDED)
699
+ INCLUDE_DIRECTORIES (src include )
700
+ ENDIF ()
701
+
692
702
ADD_EXECUTABLE (libgit2_clar ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} )
693
703
694
704
TARGET_LINK_LIBRARIES (libgit2_clar ${LIBGIT2_LINK_DEPENDENCIES} )
You can’t perform that action at this time.
0 commit comments