xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix for https://github.com/Exiv2/exiv2/issues/1856"

Browse Source 
This reverts commit e667346582.
main
Kevin Backhouse 4 years ago
parent 4901c5dba6
commit d2bdf6868f
No known key found for this signature in database
GPG Key ID: 9DD01852EE40366E
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
cmake/compilerFlags.cmake
Unescape Escape View File

@ -31,12 +31,10 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
if (COMPILER_IS_GCC OR COMPILER_IS_CLANG) if (COMPILER_IS_GCC OR COMPILER_IS_CLANG)
# This fails under Fedora - MinGW - Gcc 8.3 and macOS/M1 # This fails under Fedora - MinGW - Gcc 8.3
if (NOT (MINGW OR CYGWIN OR CMAKE_HOST_SOLARIS)) if (NOT (MINGW OR CYGWIN OR CMAKE_HOST_SOLARIS))
# macOS M1 will set ARCHITECTURE == arm64 if (NOT APPLE) # Don't know why this isn't working correctly on Apple with M1 processor
EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE ) check_cxx_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION)
if ( NOT ${ARCHITECTURE} STREQUAL arm64 )
check_cxx_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION)
endif() endif()
check_cxx_compiler_flag(-fcf-protection HAS_FCF_PROTECTION) check_cxx_compiler_flag(-fcf-protection HAS_FCF_PROTECTION)
check_cxx_compiler_flag(-fstack-protector-strong HAS_FSTACK_PROTECTOR_STRONG) check_cxx_compiler_flag(-fstack-protector-strong HAS_FSTACK_PROTECTOR_STRONG)

Write Preview
Loading…
Cancel
Save