diff options
| author | Boyuan Yang <byang@debian.org> | 2021-11-07 08:50:20 -0500 |
|---|---|---|
| committer | Boyuan Yang <byang@debian.org> | 2021-11-07 08:50:20 -0500 |
| commit | 513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44 (patch) | |
| tree | 249280ac94eb2b871de89cd1b166fff4ee00ab09 /CMakeLists.txt | |
| parent | 3c21ceac2f6a5adfab07d3d458880561543d0a31 (diff) | |
| parent | 320ef65362608ee1148c299d8d5d7618af34e470 (diff) | |
| download | libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.tar.gz libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.tar.bz2 libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.zip | |
Update upstream source from tag 'upstream/0.17.0'
Update to upstream version '0.17.0'
with Debian dir 5b612b6a2d67788b0c85bac59e50edc1545bfd7e
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e9e17a..4029de1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,10 @@ cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR) # libgav1 requires C++11. set(CMAKE_CXX_STANDARD 11) set(ABSL_CXX_STANDARD 11) +# libgav1 requires C99. +set(CMAKE_C_STANDARD 99) -project(libgav1 CXX) +project(libgav1 CXX C) set(libgav1_root "${CMAKE_CURRENT_SOURCE_DIR}") set(libgav1_build "${CMAKE_BINARY_DIR}") @@ -56,6 +58,12 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() +# Enable generators like Xcode and Visual Studio to place projects in folders. +get_property(use_folders_is_set GLOBAL PROPERTY USE_FOLDERS SET) +if(NOT use_folders_is_set) + set_property(GLOBAL PROPERTY USE_FOLDERS TRUE) +endif() + include(FindThreads) include("${libgav1_examples}/libgav1_examples.cmake") @@ -126,6 +134,7 @@ if(NOT EXISTS "${libgav1_abseil}") " clone \\\n" " https://github.com/abseil/abseil-cpp.git third_party/abseil-cpp") endif() +set(ABSL_PROPAGATE_CXX_STD ON) add_subdirectory("${libgav1_abseil}" "${libgav1_abseil_build}" EXCLUDE_FROM_ALL) libgav1_reset_target_lists() @@ -136,6 +145,12 @@ libgav1_add_tests_targets() libgav1_add_utils_targets() libgav1_setup_install_target() +if(LIBGAV1_ENABLE_TESTS) + # include(CTest) or -DBUILD_TESTING=1 aren't used to avoid enabling abseil + # tests. + enable_testing() +endif() + if(LIBGAV1_VERBOSE) libgav1_dump_cmake_flag_variables() libgav1_dump_tracked_configuration_variables() |