diff options
author | qinxialei <xialeiqin@gmail.com> | 2021-04-22 11:20:18 +0800 |
---|---|---|
committer | qinxialei <xialeiqin@gmail.com> | 2021-04-22 11:20:18 +0800 |
commit | 81ce37eb93e8ce442ecb1855a4e7166628128ac7 (patch) | |
tree | 2af6329f74f88ce090d08c61db5fb4bed8656584 /cmake/libgav1_flags.cmake | |
parent | 4dab0c756a3cdd65b43470a4cca835422b32ca6e (diff) | |
parent | 2381d803c76105f44717d75f089ec37f51e5cfe4 (diff) | |
download | libgav1-81ce37eb93e8ce442ecb1855a4e7166628128ac7.tar.gz libgav1-81ce37eb93e8ce442ecb1855a4e7166628128ac7.tar.bz2 libgav1-81ce37eb93e8ce442ecb1855a4e7166628128ac7.zip |
Update upstream source from tag 'upstream/0.16.3'
Update to upstream version '0.16.3'
with Debian dir a433e04a69210eb8fcdd6089240e161eb33f0590
Diffstat (limited to 'cmake/libgav1_flags.cmake')
-rw-r--r-- | cmake/libgav1_flags.cmake | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cmake/libgav1_flags.cmake b/cmake/libgav1_flags.cmake index 2d8d9a6..a5408e2 100644 --- a/cmake/libgav1_flags.cmake +++ b/cmake/libgav1_flags.cmake @@ -205,7 +205,7 @@ macro(libgav1_test_exe_linker_flag) # Restore cached global exe linker flags. if(cached_CMAKE_EXE_LINKER_FLAGS) - set(CMAKE_EXE_LINKER_FLAGS cached_CMAKE_EXE_LINKER_FLAGS) + set(CMAKE_EXE_LINKER_FLAGS ${cached_CMAKE_EXE_LINKER_FLAGS}) else() unset(CMAKE_EXE_LINKER_FLAGS) endif() @@ -249,3 +249,15 @@ macro(libgav1_set_cxx_flags) libgav1_test_cxx_flag(FLAG_LIST_VAR_NAMES ${cxx_flag_lists}) endmacro() + +# Sets LIBGAV1_TEST_C_FLAGS and LIBGAV1_TEST_CXX_FLAGS. +# +# Note: libgav1_set_cxx_flags() must be called before this macro. Furthermore, +# the call to this macro should be made after all additions to LIBGAV1_CXX_FLAGS +# are complete. +macro(libgav1_set_test_flags) + if(LIBGAV1_ENABLE_TESTS) + set(LIBGAV1_TEST_CXX_FLAGS ${LIBGAV1_CXX_FLAGS}) + list(FILTER LIBGAV1_TEST_CXX_FLAGS EXCLUDE REGEX "-Wframe-larger-than") + endif() +endmacro() |