diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-10-12 13:56:14 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-10-12 13:56:14 +0000 |
| commit | 09319f688e10d47f9fc9be2b6feb831fb132660a (patch) | |
| tree | 99b6c5d03da1136ebee2e1c3028f330099e49e05 /CMakeScripts/CanonicalizeFlagsVar.cmake | |
| parent | Update DefineDependsandFlags.cmake (diff) | |
| download | inkscape-09319f688e10d47f9fc9be2b6feb831fb132660a.tar.gz inkscape-09319f688e10d47f9fc9be2b6feb831fb132660a.zip | |
CMake: Avoid reordering CMAKE_CXX_FLAGS
Order matters; the reordering caused the _FORTIFY_SOURCE flag to be
always undefined (as we flipped a "-U" and "-D")
Also skip removing duplicates to avoid similar pitfalls (we kept
only the first occurrence but should've kept the last)
It did not work properly anyway (we still had duplicates in the end)
and was only required as we wrote the final CMAKE_CXX_FLAGS back to
cache and consequently appended new flags with every run of CMAKE.
Diffstat (limited to 'CMakeScripts/CanonicalizeFlagsVar.cmake')
| -rw-r--r-- | CMakeScripts/CanonicalizeFlagsVar.cmake | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/CMakeScripts/CanonicalizeFlagsVar.cmake b/CMakeScripts/CanonicalizeFlagsVar.cmake deleted file mode 100644 index ddc5b7b5d..000000000 --- a/CMakeScripts/CanonicalizeFlagsVar.cmake +++ /dev/null @@ -1,11 +0,0 @@ -# This file is copyright by Shlomi Fish, 2016. -# -# This file is licensed under the MIT/X11 license: -# https://opensource.org/licenses/mit-license.php - -macro (canonicalize_flags_var in_val out_var) - string(REPLACE " " ";" _c "${in_val}") - list(REMOVE_DUPLICATES _c) - list(SORT _c) - string(REPLACE ";" " " "${out_var}" "${_c}") -endmacro() |