From 40d47785021e4135d6fb01b94cf8940d6c89c785 Mon Sep 17 00:00:00 2001
From: Jonathan Lambrechts <jonathan.lambrechts@uclouvain.be>
Date: Wed, 16 Oct 2013 15:05:57 +0000
Subject: [PATCH] mingw-w64_x86-64 : try sjlj if seh not found (for old
mingw-w64)
---
CMakeLists.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9100d4415..6f1fb8ff02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1363,13 +1363,12 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
find_program(GCC_DLL libgcc_s_sjlj-1.dll)
find_program(STDC_DLL libstdc++-6.dll)
if(NOT GCC_DLL)
- if(HAVE_64BIT_SIZE_T)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libgcc_s_seh-1.dll
- OUTPUT_VARIABLE GCC_DLL OUTPUT_STRIP_TRAILING_WHITESPACE)
- else(HAVE_64BIT_SIZE_T)
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libgcc_s_seh-1.dll
+ OUTPUT_VARIABLE GCC_DLL OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if (NOT EXISTS "${GCC_DLL}")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libgcc_s_sjlj-1.dll
OUTPUT_VARIABLE GCC_DLL OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif(HAVE_64BIT_SIZE_T)
+ endif(NOT EXISTS "${GCC_DLL}")
get_filename_component(GCC_DLL ${GCC_DLL} ABSOLUTE)
endif(NOT GCC_DLL)
if(NOT STDC_DLL)
--
GitLab