From 7105903ca2ff084c99e651a28dc61fd600b52f58 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 23 Jul 2018 22:31:11 +0200
Subject: [PATCH] [CMake] Run Qt moc & uic just on Qt-related targets.
---
Applications/DataExplorer/CMakeLists.txt | 4 ++++
Applications/Utils/OGSFileConverter/CMakeLists.txt | 11 ++++++-----
scripts/cmake/Find.cmake | 3 ---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Applications/DataExplorer/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt
index 931bc8fc7f5..7c13d24f4e9 100644
--- a/Applications/DataExplorer/CMakeLists.txt
+++ b/Applications/DataExplorer/CMakeLists.txt
@@ -29,6 +29,10 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/NetCdfDialog/NetCdfDialogLib_autogen/include
)
+set(CMAKE_AUTOMOC TRUE)
+set(CMAKE_AUTOUIC TRUE)
+set(CMAKE_AUTORCC TRUE)
+
# Add subprojects
add_subdirectory(Base)
add_subdirectory(DataView/StratView)
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 13c0c664e62..15ec84709ea 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -11,13 +11,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/OGSFileConverterLib_autogen/include
)
-file(GLOB_RECURSE UIS *.ui)
-source_group("UI Files" FILES ${UIS})
-
add_library(OGSFileConverterLib
${SOURCES}
${HEADERS}
- ${UIS}
)
target_link_libraries(OGSFileConverterLib
PUBLIC QtBase MathLib
@@ -31,7 +27,12 @@ target_link_libraries(OGSFileConverter
ApplicationsFileIO
)
-set_property(TARGET OGSFileConverter PROPERTY FOLDER "Utilities")
+set_target_properties(OGSFileConverter OGSFileConverterLib
+ PROPERTIES
+ FOLDER "Utilities"
+ AUTOMOC ON
+ AUTOUIC ON
+)
if(OGS_USE_PCH)
cotire(OGSFileConverter)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 6530e929ff7..9c1491e33ad 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -103,9 +103,6 @@ if(OGS_BUILD_GUI)
endif()
find_package(Qt5 5.2 REQUIRED ${QT_MODULES})
cmake_policy(SET CMP0020 NEW)
- set(CMAKE_AUTOMOC TRUE)
- set(CMAKE_AUTOUIC TRUE)
- set(CMAKE_AUTORCC TRUE)
if(CMAKE_CROSSCOMPILING)
find_package(PkgConfig REQUIRED)
pkg_check_modules(QT_XML_DEPS REQUIRED Xml)
--
GitLab