From 7b6b600fd1e7488d83e607935b03bb603544db22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=A9=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 12 Mar 2021 15:55:43 +0500 Subject: [PATCH] Fixed detection of the AppleClang compiler. --- cmake/GhcHelper.cmake | 2 +- test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/GhcHelper.cmake b/cmake/GhcHelper.cmake index fbc2537..78665d2 100644 --- a/cmake/GhcHelper.cmake +++ b/cmake/GhcHelper.cmake @@ -48,7 +48,7 @@ macro(AddTestExecutableWithStdCpp cppStd) target_link_libraries(filesystem_test_cpp${cppStd} ghc_filesystem) target_compile_options(filesystem_test_cpp${cppStd} PRIVATE $<$:-s DISABLE_EXCEPTION_CATCHING=0> - $<$:-Wall -Wextra -Wshadow -Wconversion -Wsign-conversion -Wpedantic -Werror -Wno-error=deprecated-declarations> + $<$,$>:-Wall -Wextra -Wshadow -Wconversion -Wsign-conversion -Wpedantic -Werror -Wno-error=deprecated-declarations> $<$:-Wall -Wextra -Wshadow -Wconversion -Wsign-conversion -Wpedantic -Wno-psabi -Werror -Wno-error=deprecated-declarations> $<$:/WX /wd4996>) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1bc5568..a8ea09b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -19,7 +19,7 @@ else() target_link_libraries(filesystem_test ghc_filesystem) target_compile_options(filesystem_test PRIVATE $<$:-s DISABLE_EXCEPTION_CATCHING=0> - $<$:-Wall -Wextra -Wshadow -Wconversion -Wsign-conversion -Wpedantic -Werror> + $<$,$>:-Wall -Wextra -Wshadow -Wconversion -Wsign-conversion -Wpedantic -Werror> $<$:-Wall -Wextra -Wshadow -Wconversion -Wsign-conversion -Wpedantic -Wno-psabi -Werror> $<$:/WX>) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)