diff --git a/CMakeLists.txt b/CMakeLists.txt index 5adf58f4f..0629cf1ad 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/mapeditor/CMakeLists.txt b/mapeditor/CMakeLists.txt index dd1f49493..54e395b21 100644 --- a/mapeditor/CMakeLists.txt +++ b/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()