瀏覽代碼

Define Q_NO_EMIT only in editor

Ivan Savenko 10 月之前
父節點
當前提交
fdc4608e1e
共有 2 個文件被更改,包括 3 次插入4 次删除
  1. 0 4
      CMakeLists.txt
  2. 3 0
      mapeditor/CMakeLists.txt

+ 0 - 4
CMakeLists.txt

@@ -255,10 +255,6 @@ 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)

+ 3 - 0
mapeditor/CMakeLists.txt

@@ -223,6 +223,9 @@ if(APPLE)
 	set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER vcmieditor)
 endif()
 
+# Qt defines 'emit' as macros, which conflicts with TBB definition of method with same name
+target_compile_definitions(vcmieditor PRIVATE QT_NO_EMIT)
+
 if(ENABLE_STATIC_LIBS OR NOT (ENABLE_EDITOR AND ENABLE_LAUNCHER))
 	target_compile_definitions(vcmieditor PRIVATE VCMIQT_STATIC)
 endif()