fly/flightgear
1
0
Fork 0
Code Activity

Only set AUTOMOC for fglauncher target.

Browse source 
(Avoids pointless noise for all other targets)
This commit is contained in:
James Turner 2015-01-07 09:38:02 +00:00
parent 1ba62acfcc
commit 72e0ea9e40
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -245,7 +245,7 @@ endif()
if (SYSTEM_SQLITE) if (SYSTEM_SQLITE)
find_package(SQLite3 REQUIRED) find_package(SQLite3 REQUIRED)
message(STATUS "Using system SQLite3 library") message(STATUS "Using system SQLite3 library")
else() else()
set(SQLITE3_INCLUDED_DIR "${CMAKE_SOURCE_DIR}/3rdparty/sqlite3") set(SQLITE3_INCLUDED_DIR "${CMAKE_SOURCE_DIR}/3rdparty/sqlite3")
@ -284,7 +284,6 @@ find_package(Qt5 5.1 COMPONENTS Widgets)
if (Qt5Widgets_FOUND) if (Qt5Widgets_FOUND)
message(STATUS "Will enable Qt launcher GUI") message(STATUS "Will enable Qt launcher GUI")
set(HAVE_QT 1) set(HAVE_QT 1)
set(CMAKE_AUTOMOC ON)
endif() endif()
############################################################################## ##############################################################################
@ -321,10 +320,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(WARNING_FLAGS_C "-Wall") set(WARNING_FLAGS_C "-Wall")
endif(CMAKE_COMPILER_IS_GNUCXX) 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_CXX "-Wall -Wno-overloaded-virtual")
set (WARNING_FLAGS_C "-Wall") set (WARNING_FLAGS_C "-Wall")
endif() endif()
if(WIN32) if(WIN32)

1
src/GUI/CMakeLists.txt
View file

@ -84,6 +84,7 @@ if (HAVE_QT)
${uic_sources} ${uic_sources}
${qrc_sources}) ${qrc_sources})
set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
target_link_libraries(fglauncher Qt5::Core Qt5::Widgets ) target_link_libraries(fglauncher Qt5::Core Qt5::Widgets )