Przeglądaj źródła

Define Q_NO_EMIT in cmake in order to include moc compilation

Ivan Savenko 10 miesięcy temu
rodzic
commit
2ebf37beb0
2 zmienionych plików z 4 dodań i 3 usunięć
  1. 4 0
      CMakeLists.txt
  2. 0 3
      Global.h

+ 4 - 0
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)

+ 0 - 3
Global.h

@@ -273,9 +273,6 @@ using TLockGuardRec = std::lock_guard<std::recursive_mutex>;
 #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 */
 /* ---------------------------------------------------------------------------- */