Skip to content

Commit 56893bb

Browse files
committed
cmake: consistently use TARGET_INCLUDE_DIRECTORIES if available
Instead of using INCLUDE_DIRECTORIES again for the libgit2_clar test suite, we should just be using TARGET_INCLUDE_DIRECTORIES again if the CMake version is greater than 2.8.11.
1 parent 22de81e commit 56893bb

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ TARGET_OS_LIBRARIES(git2)
620620

621621
IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
622622
INCLUDE_DIRECTORIES(src include)
623-
SET(LIBGIT2_INNER_DIRECTORIES_ARE_INCLUDED TRUE)
624623
ELSE()
625624
TARGET_INCLUDE_DIRECTORIES(git2 PRIVATE src PUBLIC include)
626625
ENDIF()
@@ -694,12 +693,12 @@ IF (BUILD_CLAR)
694693
${CLAR_PATH}/clar.c
695694
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clar.suite)
696695

697-
IF (NOT LIBGIT2_INNER_DIRECTORIES_ARE_INCLUDED)
698-
INCLUDE_DIRECTORIES(src include)
699-
ENDIF()
700-
701696
ADD_EXECUTABLE(libgit2_clar ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1})
702697

698+
IF (${CMAKE_VERSION} VERSION_GREATER 2.8.11)
699+
TARGET_INCLUDE_DIRECTORIES(libgit2_clar PRIVATE src PUBLIC include)
700+
ENDIF()
701+
703702
TARGET_LINK_LIBRARIES(libgit2_clar ${COREFOUNDATION_DIRS})
704703
TARGET_LINK_LIBRARIES(libgit2_clar ${SECURITY_DIRS})
705704
TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES})

0 commit comments

Comments
 (0)