From ea62f5daf16ab3442d17946c53b9fdad5a9a11fd Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Sat, 9 May 2020 20:01:25 +0100 Subject: [PATCH 1/2] Fixes cmake case-matching warnings The actual warnings are: --- CMake Warning (dev) at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:272 (message): The package name passed to `find_package_handle_standard_args` (SETCAP) does not match the name of the calling package (Setcap). This can lead to problems in calling code that expects `find_package` result variables (e.g., `_FOUND`) to follow a certain pattern. Call Stack (most recent call first): cmake/FindSetcap.cmake:8 (find_package_handle_standard_args) CMakeLists.txt:82 (find_package) This warning is for project developers. Use -Wno-dev to suppress it. CMake Warning (dev) at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:272 (message): The package name passed to `find_package_handle_standard_args` (FFMPEG) does not match the name of the calling package (FFmpeg). This can lead to problems in calling code that expects `find_package` result variables (e.g., `_FOUND`) to follow a certain pattern. Call Stack (most recent call first): cmake/FindFFmpeg.cmake:91 (find_package_handle_standard_args) src/CoreAudio/CMakeLists.txt:6 (find_package) This warning is for project developers. Use -Wno-dev to suppress it. --- --- cmake/FindFFmpeg.cmake | 2 +- cmake/FindSetcap.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake index b34be8637..0cb89e9ac 100644 --- a/cmake/FindFFmpeg.cmake +++ b/cmake/FindFFmpeg.cmake @@ -88,7 +88,7 @@ else() endif() endif() -find_package_handle_standard_args(FFMPEG +find_package_handle_standard_args(FFmpeg FOUND_VAR FFMPEG_FOUND REQUIRED_VARS FFMPEG_LIBRARIES diff --git a/cmake/FindSetcap.cmake b/cmake/FindSetcap.cmake index 84e0292d2..31184de30 100644 --- a/cmake/FindSetcap.cmake +++ b/cmake/FindSetcap.cmake @@ -5,7 +5,7 @@ find_program(SETCAP_EXECUTABLE PATHS /bin /usr/bin /sbin /usr/sbin ) -find_package_handle_standard_args(SETCAP DEFAULT_MSG SETCAP_EXECUTABLE) +find_package_handle_standard_args(Setcap DEFAULT_MSG SETCAP_EXECUTABLE) mark_as_advanced(SETCAP_EXECUTABLE) -- 2.51.2 From a3b4bf2932331be781b301069182751b64febe5a Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Sat, 9 May 2020 23:23:35 +0100 Subject: [PATCH 2/2] The default is now 30; make 31 as example --- rpm/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/README.md b/rpm/README.md index f9f94a7ad..259113ff8 100644 --- a/rpm/README.md +++ b/rpm/README.md @@ -9,9 +9,9 @@ ## Building on other operating systems -By default, it will build for Fedora 29. To use a different OS, simply +By default, it will build for Fedora 30. To use a different OS, simply - RPM_OS=fedora:27 docker-compose build rpm + RPM_OS=fedora:31 docker-compose build rpm ## Future improvements -- 2.51.2