diff options
author | Brad King <brad.king@kitware.com> | 2023-03-30 10:56:51 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-30 06:57:10 -0400 |
commit | 2f3ba93102d1a3e6f4674b27b95853ea613d4bf6 (patch) | |
tree | d5345cfcc293d095e816a860c1c96b41076e765a /Tests | |
parent | cecdd470a9c30fdfb34eccd609784c02c1796bc5 (diff) | |
parent | f05bd762f502330221056329e1800d57e4300c97 (diff) | |
download | cmake-2f3ba93102d1a3e6f4674b27b95853ea613d4bf6.tar.gz |
Merge topic 'FindOpenAL-framework'
f05bd762f5 ci: Enable FindOpenAL test on macOS jobs
1d06554fc6 Tests: Fix FindOpenAL test for macOS framework
5f5476ee31 FindOpenAL: Fix imported target for macOS framework
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8373
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/FindOpenAL/Test/CMakeLists.txt | 6 | ||||
-rw-r--r-- | Tests/FindOpenAL/Test/main.cxx | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Tests/FindOpenAL/Test/CMakeLists.txt b/Tests/FindOpenAL/Test/CMakeLists.txt index fa3e2638ee..6479df6420 100644 --- a/Tests/FindOpenAL/Test/CMakeLists.txt +++ b/Tests/FindOpenAL/Test/CMakeLists.txt @@ -12,3 +12,9 @@ add_executable(test_var main.cxx) target_include_directories(test_var PRIVATE ${OPENAL_INCLUDE_DIR}) target_link_libraries(test_var PRIVATE ${OPENAL_LIBRARY}) add_test(NAME test_var COMMAND test_var) + +# OpenAL has been deprecated on macOS since Catalina (10.15) +if(APPLE) + target_compile_options(test_tgt PRIVATE "-Wno-deprecated-declarations") + target_compile_options(test_var PRIVATE "-Wno-deprecated-declarations") +endif() diff --git a/Tests/FindOpenAL/Test/main.cxx b/Tests/FindOpenAL/Test/main.cxx index bb45faf5b9..1396c60b32 100644 --- a/Tests/FindOpenAL/Test/main.cxx +++ b/Tests/FindOpenAL/Test/main.cxx @@ -1,5 +1,10 @@ -#include <AL/al.h> -#include <AL/alc.h> +#ifdef __APPLE__ +# include "OpenAL/al.h" +# include "OpenAL/alc.h" +#else +# include <AL/al.h> +# include <AL/alc.h> +#endif #include <stdio.h> int main() |