diff --git a/Applications/DataExplorer/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt index 931bc8fc7f5b4eb6961101a935fad1b5ed2f849e..7c13d24f4e9b26400a8b1ced4fc0e62597f9a32c 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 13c0c664e62cf035a662366a287c7f46e62d84a7..15ec84709ea3e051c2cfa803cdf1fba774f4a568 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 6530e929ff7ce5f103c77846db3b3922d4fe64da..9c1491e33ad39fff9d499a1e0266ce9e26eeac5e 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)