diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-23 00:32:40 +0000 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-25 09:06:50 +0000 |
commit | c951b825bcffdb26140633f657e740e593ea0e80 (patch) | |
tree | 69a6149da99251b8cf9edb7ad8f97f346afbdeeb | |
parent | 9f3a5a64b5f3c402e14094da2e4e71d49f03be9e (diff) | |
download | libgit2-c951b825bcffdb26140633f657e740e593ea0e80.tar.gz |
deprecation: define GIT_DEPRECATE_HARD internally
Ensure that we do not use any deprecated functions in the library
source, test code or examples.
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/stream/deprecated.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bc3f07c11..eecc22d20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,6 +105,9 @@ SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${ FILE(STRINGS "${libgit2_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION [0-9]+$") STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION ([0-9]+)$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}") +# Ensure that we do not use deprecated functions internally +ADD_DEFINITIONS(-DGIT_DEPRECATE_HARD) + # Platform specific compilation flags IF (MSVC) IF (STDCALL) @@ -229,7 +232,6 @@ ELSE () ENABLE_WARNINGS(int-conversion) DISABLE_WARNINGS(documentation-deprecated-sync) - IF (PROFILE) SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}") SET(CMAKE_EXE_LINKER_FLAGS "-pg ${CMAKE_EXE_LINKER_FLAGS}") diff --git a/tests/stream/deprecated.c b/tests/stream/deprecated.c index 4fb422e63..2c2bbfdc3 100644 --- a/tests/stream/deprecated.c +++ b/tests/stream/deprecated.c @@ -1,3 +1,5 @@ +#undef GIT_DEPRECATE_HARD + #include "clar_libgit2.h" #include "git2/sys/stream.h" #include "streams/tls.h" |