Trying to solve issue on ARM

Exiv2 · Jun 10, 2020 · a405cf2 · a405cf2
1 parent 6624c5b
commit a405cf2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake
@@ -25,15 +25,15 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
 
         # This fails under Fedora - MinGW - Gcc 8.3
         if (NOT MINGW)
-            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
+            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7.0")
                 if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
                     add_compile_options(-fstack-clash-protection -fcf-protection)
                 else()
                     add_compile_options(-fstack-clash-protection)
                 endif()
             endif()
 
-            if (COMPILER_IS_GCC OR (COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 3.7 ))
+            if (COMPILER_IS_GCC OR (COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.6" ))
                 # is not available for clang 3.4.2. it appears to be present in clang 3.7.
                 add_compile_options(-fstack-protector-strong)
             endif()

diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake
@@ -1,6 +1,10 @@
 # In this file we configure some CMake settings we do not want to make visible directly in the main
 # CMakeLists.txt file.
 
+if(POLICY CMP0054)  # CMake 3.1: Only interpret if() arguments as variables or keywords when unquoted.
+  cmake_policy(SET CMP0054 NEW)
+endif()
+
 include(GNUInstallDirs)
 include(CheckFunctionExists)
 include(GenerateExportHeader)