From 3bad9e1ffaeb781267a71afa9f68efbbad17f2f3 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 10 Jul 2019 16:00:53 +0200 Subject: [PATCH] [CMake] Replace Qt5XmlPatterns_FOUND with OGS_BUILD_GUI. --- Applications/FileIO/CMakeLists.txt | 2 +- Applications/Utils/FileConverter/CMakeLists.txt | 4 ++-- Applications/Utils/GeoTools/CMakeLists.txt | 2 +- BaseLib/CMakeLists.txt | 4 ++-- GeoLib/CMakeLists.txt | 4 ++-- Tests/CMakeLists.txt | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt index 91b4dfc6a13..eaaed88a542 100644 --- a/Applications/FileIO/CMakeLists.txt +++ b/Applications/FileIO/CMakeLists.txt @@ -10,7 +10,7 @@ endif() GET_SOURCE_FILES(SOURCES_GO2OGS GocadIO) set(SOURCES ${SOURCES} ${SOURCES_GO2OGS}) -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) APPEND_SOURCE_FILES(SOURCES XmlIO/Qt) APPEND_SOURCE_FILES(SOURCES FEFLOW) endif() diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt index f0fb66a6dec..7486e07600e 100644 --- a/Applications/Utils/FileConverter/CMakeLists.txt +++ b/Applications/Utils/FileConverter/CMakeLists.txt @@ -1,4 +1,4 @@ -if (Qt5XmlPatterns_FOUND) +if (OGS_BUILD_GUI) if (Shapelib_FOUND) add_executable(ConvertSHPToGLI ConvertSHPToGLI.cpp) set_target_properties(ConvertSHPToGLI PROPERTIES FOLDER Utilities) @@ -71,7 +71,7 @@ install(TARGETS Mesh2Raster RUNTIME DESTINATION bin COMPONENT ogs_converter) -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) if(Shapelib_FOUND) install(TARGETS ConvertSHPToGLI RUNTIME DESTINATION bin COMPONENT ogs_converter) diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt index 0d0723a436d..e65cb74e20e 100644 --- a/Applications/Utils/GeoTools/CMakeLists.txt +++ b/Applications/Utils/GeoTools/CMakeLists.txt @@ -1,4 +1,4 @@ -if(NOT Qt5XmlPatterns_FOUND) +if(NOT OGS_BUILD_GUI) return() endif() diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt index e51c8c30639..52f8a8e03db 100644 --- a/BaseLib/CMakeLists.txt +++ b/BaseLib/CMakeLists.txt @@ -3,7 +3,7 @@ APPEND_SOURCE_FILES(SOURCES IO) APPEND_SOURCE_FILES(SOURCES IO/XmlIO) -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Qt) endif() @@ -25,7 +25,7 @@ if(MSVC) target_link_libraries(BaseLib PUBLIC WinMM) # needed for timeGetTime endif() -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) target_link_libraries(BaseLib PUBLIC Qt5::Xml Qt5::XmlPatterns) endif() diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt index 1f22c6b6fac..7c9fbf15995 100644 --- a/GeoLib/CMakeLists.txt +++ b/GeoLib/CMakeLists.txt @@ -6,7 +6,7 @@ APPEND_SOURCE_FILES(SOURCES IO) APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Rapid) APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Boost) -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Qt) endif() @@ -18,7 +18,7 @@ endif() target_link_libraries(GeoLib PUBLIC BaseLib MathLib logog PRIVATE tet) -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) target_link_libraries(GeoLib PUBLIC Qt5::Xml Qt5::XmlPatterns) endif() diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5e046f8e731..9590644f19e 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -19,7 +19,7 @@ APPEND_SOURCE_FILES(TEST_SOURCES NumLib) APPEND_SOURCE_FILES(TEST_SOURCES ParameterLib) APPEND_SOURCE_FILES(TEST_SOURCES ProcessLib) -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) APPEND_SOURCE_FILES(TEST_SOURCES FileIO_Qt) endif() @@ -71,7 +71,7 @@ if(OGS_INSITU) target_link_libraries(testrunner InSituLib) endif() -if(Qt5XmlPatterns_FOUND) +if(OGS_BUILD_GUI) target_link_libraries(testrunner Qt5::Core Qt5::Gui Qt5::Xml Qt5::Network VtkVis QtDataView) endif() -- GitLab