8000 CMake: INCLUDE_DIRECTORIES -> TARGET_INCLUDE_DIRECTORIES by AndreyG · Pull Request #4284 · libgit2/libgit2 · GitHub
[go: up one dir, main page]
Skip to content

CMake: INCLUDE_DIRECTORIES -> TARGET_INCLUDE_DIRECTORIES #4284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

CMake: INCLUDE_DIRECTORIES -> TARGET_INCLUDE_DIRECTORIES #4284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b28604
CMakeLists.txt: eliminate some code duplication
AndreyG Jun 26, 2017
905d80f
Use `target_include_directories` for modern cmake
AndreyG Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,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 u 8000 se, fall back to OpenSSL there
Expand Down Expand Up @@ -610,14 +609,24 @@ ENDIF()

# Compile and link libgit2
ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} ${WIN_RC})
TARGET_LINK_LIBRARIES(git2 ${SECURITY_DIRS})
TARGET_LINK_LIBRARIES(git2 ${COREFOUNDATION_DIRS})
TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES})
TARGET_LINK_LIBRARIES(git2 ${SSH_LIBRARIES})
TARGET_LINK_LIBRARIES(git2 ${GSSAPI_LIBRARIES})
TARGET_LINK_LIBRARIES(git2 ${ICONV_LIBRARIES})
SET(LIBGIT2_LINK_DEPENDENCIES
${SECURITY_DIRS}
${COREFOUNDATION_DIRS}
${SSL_LIBRARIES}
${SSH_LIBRARIES}
${GSSAPI_LIBRARIES}
${ICONV_LIBRARIES}
)
TARGET_LINK_LIBRARIES(git2 ${LIBGIT2_LINK_DEPENDENCIES})
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)
Expand Down Expand Up @@ -686,14 +695,13 @@ IF (BUILD_CLAR)
${CLAR_PATH}/clar.c
PROPERTIES OBJECT_DEPENDS ${CLAR_PATH}/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})
TARGET_LINK_LIBRARIES(libgit2_clar ${SECURITY_DIRS})
TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES})
TARGET_LINK_LIBRARIES(libgit2_clar ${SSH_LIBRARIES})
TARGET_LINK_LIBRARIES(libgit2_clar ${GSSAPI_LIBRARIES})
TARGET_LINK_LIBRARIES(libgit2_clar ${ICONV_LIBRARIES})
TARGET_LINK_LIBRARIES(libgit2_clar ${LIBGIT2_LINK_DEPENDENCIES})
TARGET_OS_LIBRARIES(libgit2_clar)
IDE_SPLIT_SOURCES(libgit2_clar)

Expand Down
0