From 2ebf37beb064b0b3e34a465d9763e45dfcc442db Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 21 Dec 2024 19:24:26 +0000 Subject: [PATCH] Define Q_NO_EMIT in cmake in order to include moc compilation --- CMakeLists.txt | 4 ++++ Global.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0629cf1ad..5adf58f4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,6 +255,10 @@ if(ENABLE_GOLDMASTER) add_definitions(-DENABLE_GOLDMASTER) endif() +# Qt defines 'emit' as macros, which conflicts with TBB definition of method with same name +add_definitions(-DQT_NO_EMIT) + + if(APPLE_IOS) set(CMAKE_MACOSX_RPATH 1) set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0) diff --git a/Global.h b/Global.h index 33e86b131..f43dfa851 100644 --- a/Global.h +++ b/Global.h @@ -273,9 +273,6 @@ using TLockGuardRec = std::lock_guard; #define VCMI_LIB_WRAP_NAMESPACE(x) ::x #endif -// Qt defines 'emit' as macros, which conflicts with TBB definition of method with same name -#define QT_NO_EMIT - /* ---------------------------------------------------------------------------- */ /* VCMI standard library */ /* ---------------------------------------------------------------------------- */