From 5f36bf46e86b289c453d4df1b9c9e4332f9e917f Mon Sep 17 00:00:00 2001 From: clanmills Date: Fri, 24 Apr 2020 15:38:50 +0100 Subject: [PATCH] Fix for issue identified in #1175 --- cmake/compilerFlags.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake index 190b1c67..f2018781 100644 --- a/cmake/compilerFlags.cmake +++ b/cmake/compilerFlags.cmake @@ -23,8 +23,8 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN if (COMPILER_IS_GCC OR COMPILER_IS_CLANG) - # This fails under Fedora - MinGW - Gcc 8.3 - if (NOT MINGW AND NOT CMAKE_HOST_SOLARIS) + # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 + if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) add_compile_options(-fstack-clash-protection -fcf-protection) endif()