blob: 86f0aab56e409391c2ad8ee9331d01ba097bfb3f (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
- Sync -std= with devel/abseil to match ABI
- Avoid leaking abseil dependency to shared library consumers
--- CMakeLists.txt.orig 2022-06-30 20:41:58 UTC
+++ CMakeLists.txt
@@ -16,8 +16,8 @@ cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR)
cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR)
# libgav1 requires C++11.
-set(CMAKE_CXX_STANDARD 11)
-set(ABSL_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
+set(ABSL_CXX_STANDARD 17)
# libgav1 requires C99.
set(CMAKE_C_STANDARD 99)
@@ -131,6 +131,8 @@ libgav1_set_test_flags()
# Set test-only flags based on LIBGAV1_CXX_FLAGS.
libgav1_set_test_flags()
+find_package(absl)
+if(NOT TARGET absl::base)
set(libgav1_abseil "${libgav1_root}/third_party/abseil-cpp")
if(EXISTS "${libgav1_abseil}")
set(ABSL_PROPAGATE_CXX_STD ON)
@@ -148,6 +150,7 @@ endif()
" https://github.com/abseil/abseil-cpp.git third_party/abseil-cpp")
endif()
endif()
+endif() # NOT TARGET absl::base
libgav1_reset_target_lists()
libgav1_add_dsp_targets()
|
