Skip to content

Commit 1f9b497

Browse files
authored
Merge pull request libgit2#5260 from pks-t/pks/cmake3
cmake: update minimum CMake version to v3.5.1
2 parents 6716e2f + ebabb88 commit 1f9b497

File tree

3 files changed

+6
-24
lines changed

3 files changed

+6
-24
lines changed

CMakeLists.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# > cmake --build . --target install
1313

1414
PROJECT(libgit2 C)
15-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
15+
CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
1616
CMAKE_POLICY(SET CMP0015 NEW)
1717
IF(POLICY CMP0051)
1818
CMAKE_POLICY(SET CMP0051 NEW)
@@ -335,10 +335,5 @@ IF(BUILD_FUZZERS)
335335
ADD_SUBDIRECTORY(fuzzers)
336336
ENDIF()
337337

338-
IF(CMAKE_VERSION VERSION_GREATER 3)
339-
FEATURE_SUMMARY(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
340-
FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
341-
ELSE()
342-
PRINT_ENABLED_FEATURES()
343-
PRINT_DISABLED_FEATURES()
344-
ENDIF()
338+
FEATURE_SUMMARY(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
339+
FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")

src/CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -333,16 +333,8 @@ SET_TARGET_PROPERTIES(git2internal PROPERTIES C_STANDARD 90)
333333
IDE_SPLIT_SOURCES(git2internal)
334334
LIST(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:git2internal>)
335335

336-
IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
337-
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
338-
INCLUDE_DIRECTORIES(SYSTEM ${LIBGIT2_SYSTEM_INCLUDES})
339-
ELSE()
340-
TARGET_INCLUDE_DIRECTORIES(git2internal
341-
PRIVATE ${LIBGIT2_INCLUDES}
342-
PUBLIC ${libgit2_SOURCE_DIR}/include)
343-
TARGET_INCLUDE_DIRECTORIES(git2internal
344-
SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
345-
ENDIF()
336+
TARGET_INCLUDE_DIRECTORIES(git2internal PRIVATE ${LIBGIT2_INCLUDES} PUBLIC ${libgit2_SOURCE_DIR}/include)
337+
TARGET_INCLUDE_DIRECTORIES(git2internal SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
346338

347339
SET(LIBGIT2_OBJECTS ${LIBGIT2_OBJECTS} PARENT_SCOPE)
348340
SET(LIBGIT2_INCLUDES ${LIBGIT2_INCLUDES} PARENT_SCOPE)

tests/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,7 @@ ADD_EXECUTABLE(libgit2_clar ${SRC_CLAR} ${SRC_TEST} ${LIBGIT2_OBJECTS})
4242
SET_TARGET_PROPERTIES(libgit2_clar PROPERTIES C_STANDARD 90)
4343
SET_TARGET_PROPERTIES(libgit2_clar PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
4444

45-
IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
46-
# Already handled by a global INCLUDE_DIRECTORY()
47-
ELSE()
48-
TARGET_INCLUDE_DIRECTORIES(libgit2_clar PRIVATE ../src PUBLIC ../include)
49-
ENDIF()
50-
45+
TARGET_INCLUDE_DIRECTORIES(libgit2_clar PRIVATE ../src PUBLIC ../include)
5146
TARGET_LINK_LIBRARIES(libgit2_clar ${LIBGIT2_LIBS})
5247
IDE_SPLIT_SOURCES(libgit2_clar)
5348

0 commit comments

Comments
 (0)