From 1d4f03823b509e22ccf0df42c9f058e5cbb0ca02 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 10 Nov 2020 21:28:51 -0600 Subject: [PATCH] [nostalgia] Move Auto-Moc settings to Qt project directories --- src/nostalgia/CMakeLists.txt | 2 -- src/nostalgia/core/qt/CMakeLists.txt | 4 ++++ src/nostalgia/core/studio/CMakeLists.txt | 4 ++++ src/nostalgia/studio/CMakeLists.txt | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt index ff199724..9d04f333 100644 --- a/src/nostalgia/CMakeLists.txt +++ b/src/nostalgia/CMakeLists.txt @@ -6,8 +6,6 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "Native") if(NOSTALGIA_BUILD_STUDIO) find_package(Qt5Widgets REQUIRED) find_package(Qt5QuickWidgets REQUIRED) - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) endif() endif() diff --git a/src/nostalgia/core/qt/CMakeLists.txt b/src/nostalgia/core/qt/CMakeLists.txt index 507abd98..9683dcc8 100644 --- a/src/nostalgia/core/qt/CMakeLists.txt +++ b/src/nostalgia/core/qt/CMakeLists.txt @@ -1,3 +1,7 @@ + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + add_library( NostalgiaCore-Qt SHARED gfx.cpp diff --git a/src/nostalgia/core/studio/CMakeLists.txt b/src/nostalgia/core/studio/CMakeLists.txt index b4727682..ee0eb41f 100644 --- a/src/nostalgia/core/studio/CMakeLists.txt +++ b/src/nostalgia/core/studio/CMakeLists.txt @@ -1,3 +1,7 @@ + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + add_library( NostalgiaCore-Studio SHARED imgconv.cpp diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt index ca7af9ca..428cbf2c 100644 --- a/src/nostalgia/studio/CMakeLists.txt +++ b/src/nostalgia/studio/CMakeLists.txt @@ -1,5 +1,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + add_executable( nostalgia-studio MACOSX_BUNDLE json_read.cpp