From 72e0ea9e400a33247e1f5fef6ec347fc7181bb3e Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 7 Jan 2015 09:38:02 +0000 Subject: [PATCH] Only set AUTOMOC for fglauncher target. (Avoids pointless noise for all other targets) --- CMakeLists.txt | 7 +++---- src/GUI/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ab94ff0..92f9c7b67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,7 @@ endif() if (SYSTEM_SQLITE) find_package(SQLite3 REQUIRED) - + message(STATUS "Using system SQLite3 library") else() set(SQLITE3_INCLUDED_DIR "${CMAKE_SOURCE_DIR}/3rdparty/sqlite3") @@ -284,7 +284,6 @@ find_package(Qt5 5.1 COMPONENTS Widgets) if (Qt5Widgets_FOUND) message(STATUS "Will enable Qt launcher GUI") set(HAVE_QT 1) - set(CMAKE_AUTOMOC ON) endif() ############################################################################## @@ -321,10 +320,10 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(WARNING_FLAGS_C "-Wall") endif(CMAKE_COMPILER_IS_GNUCXX) -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set (WARNING_FLAGS_CXX "-Wall -Wno-overloaded-virtual") set (WARNING_FLAGS_C "-Wall") -endif() +endif() if(WIN32) diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index d31e4f192..37c2af623 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -84,6 +84,7 @@ if (HAVE_QT) ${uic_sources} ${qrc_sources}) + set_property(TARGET fglauncher PROPERTY AUTOMOC ON) target_link_libraries(fglauncher Qt5::Core Qt5::Widgets )