Skip to content

Commit 172a585

Browse files
committed
cmake: always use object library for git2internal
As we have bumped our minimum CMake version to 2.8.11, we can now unconditionally make use of object libraries. So remove the version check for the git2internal object library and always use it.
1 parent cf9f345 commit 172a585

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

src/CMakeLists.txt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -334,21 +334,16 @@ CONFIGURE_FILE(features.h.in git2/sys/features.h)
334334

335335
SET(LIBGIT2_SOURCES ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_SSH} ${SRC_SHA1})
336336

337-
IF (CMAKE_VERSION VERSION_GREATER 2.8.7)
338-
ADD_LIBRARY(git2internal OBJECT ${LIBGIT2_SOURCES})
339-
IDE_SPLIT_SOURCES(git2internal)
340-
LIST(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:git2internal>)
337+
ADD_LIBRARY(git2internal OBJECT ${LIBGIT2_SOURCES})
338+
IDE_SPLIT_SOURCES(git2internal)
339+
LIST(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:git2internal>)
341340

342-
IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
343-
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
344-
ELSE()
345-
TARGET_INCLUDE_DIRECTORIES(git2internal
346-
PRIVATE ${LIBGIT2_INCLUDES}
347-
PUBLIC ${CMAKE_SOURCE_DIR}/include)
348-
ENDIF()
349-
ELSE()
341+
IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
350342
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
351-
LIST(APPEND LIBGIT2_OBJECTS ${LIBGIT2_SOURCES})
343+
ELSE()
344+
TARGET_INCLUDE_DIRECTORIES(git2internal
345+
PRIVATE ${LIBGIT2_INCLUDES}
346+
PUBLIC ${CMAKE_SOURCE_DIR}/include)
352347
ENDIF()
353348

354349
SET(LIBGIT2_OBJECTS ${LIBGIT2_OBJECTS} PARENT_SCOPE)

0 commit comments

Comments
 (0)