From 10fa9bfe0ab3aee8e613540d127504c48c33ba86 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Tue, 16 Apr 2019 23:04:07 +0200 Subject: [PATCH] [SHELL32_APITEST] Disable exceptions in atl when compiling without exceptions --- modules/rostests/apitests/shell32/CMakeLists.txt | 3 +++ modules/rostests/apitests/shell32/shelltest.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 8201a6f12ee..868b6866309 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -1,4 +1,7 @@ +add_definitions( + -D_ATL_NO_EXCEPTIONS) + set_cpp(WITH_RUNTIME) spec2def(shell32_apitest.exe shell32_apitest.spec) diff --git a/modules/rostests/apitests/shell32/shelltest.h b/modules/rostests/apitests/shell32/shelltest.h index 75951cbac47..2271b51aa4d 100644 --- a/modules/rostests/apitests/shell32/shelltest.h +++ b/modules/rostests/apitests/shell32/shelltest.h @@ -1,7 +1,7 @@ #ifndef _SHELLTEST_H_ #define _SHELLTEST_H_ -#define _INC_WINDOWS +//#define _INC_WINDOWS #define COM_NO_WINDOWS_H #include -- 2.17.1