summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2021-03-29 22:55:57 +0200
committerSebastian Pipping <sebastian@pipping.org>2021-03-29 22:55:57 +0200
commitcf1bfe69b02c533bf2803c23a8e300e59127a2f7 (patch)
treee6f308eb5f895bbf708a047c0ad545c0cd60c757
parent38241abd60f6a61d1d2e6ee3c0a27a22a3567434 (diff)
downloaduriparser-cf1bfe69b02c533bf2803c23a8e300e59127a2f7.tar.gz
Revert "CMake: Exclude target "testrunner" from "add_definitions(/WX)""
This reverts commit d3fc9dcb14142118cb73116bede2b1b01bb0b7fd.
-rw-r--r--CMakeLists.txt14
-rw-r--r--ChangeLog4
2 files changed, 1 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 217d48a..fce0cf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -319,19 +319,7 @@ endif()
#
if(URIPARSER_WARNINGS_AS_ERRORS)
if(MSVC)
- # NOTE: We cannot use global "add_definitions(/WX)" currently because:
- # - it would affect target "testrunner"
- # - testrunner depends on googletest
- # - googletest is not free of warnings
- # - CMake's "target_include_directories([..] SYSTEM PRIVATE [..])"
- # is not showing any effect with MSVC
- # - The equivalent of Clang's "-isystem <includedir>" is
- # marked as experimental and a dead-end street according to
- # https://developercommunity.visualstudio.com/t/fully-support-c-externali-flag-instead-of-making-i/1191080
- # so that is not used, either.
- # As a result, warnings are fatal for all target but "testrunner" as of today.
- target_compile_definitions(uriparser PRIVATE /WX) # the library
- target_compile_definitions(uriparse PRIVATE /WX) # the CLI
+ add_definitions(/WX)
else()
set(URIPARSER_EXTRA_COMPILE_FLAGS "${URIPARSER_EXTRA_COMPILE_FLAGS} -Werror")
endif()
diff --git a/ChangeLog b/ChangeLog
index 3609a07..0dd0640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,10 +8,6 @@ XXXX-XX-XX -- X.X.X
CMAKE_CXX_* variables (GitHub #110)
Thanks to Alexander Richardson for the patch (originally at libexpat)
* Fixed: Windows: Address MSVC compiler warnings (GitHub #111)
- * Improved: Windows: Exclude target "testrunner" from
- -DURIPARSER_WARNINGS_AS_ERRORS=ON because dependency googletest
- is not free of warnings and MSVC seems to lack an equivalent
- of Clang's -isystem that is not marked experimental (GitHub #110)
2021-03-18 -- 0.9.5