From 7cb4243cf8e27806008554e0048c831f209783f3 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 19 Dec 2016 14:32:53 +0100
Subject: [PATCH] Fix linker errors.
---
Applications/DataExplorer/Base/CMakeLists.txt | 2 +-
Applications/Utils/OGSFileConverter/CMakeLists.txt | 4 +---
scripts/cmake/Find.cmake | 3 +++
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index 0f05dccec88..8c5ce146dfa 100644
--- a/Applications/DataExplorer/Base/CMakeLists.txt
+++ b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -37,7 +37,7 @@ add_library(QtBase
)
target_link_libraries(QtBase
- Qt5::Gui
+ Qt5::Widgets
GeoLib)
set_property(TARGET QtBase PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 03f55447988..a6e34797932 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -13,7 +13,7 @@ set(SOURCES
OGSFileConverter.cpp
)
-find_package(Qt4 QUIET REQUIRED)
+find_package(Qt5 QUIET REQUIRED Gui Widgets Xml XmlPatterns)
include_directories(
${CMAKE_BINARY_DIR}/Applications/Utils/OGSFileConverter
@@ -47,8 +47,6 @@ target_link_libraries(OGSFileConverter
GeoLib)
ADD_VTK_DEPENDENCY(OGSFileConverter)
-include(${QT_USE_FILE})
-
set(CMAKE_CONFIGURATION_TYPES "Release;Debug" CACHE TYPE INTERNAL FORCE)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 98e7288d7b9..d8cbb79405a 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -96,6 +96,9 @@ find_package(Metis QUIET)
## Qt5 library ##
if(OGS_BUILD_GUI)
+ if(USE_CONAN)
+ set(Qt5_DIR ${CONAN_QT_ROOT}/lib/cmake/Qt5)
+ endif()
find_package( Qt5 5.5 REQUIRED Gui Widgets Xml XmlPatterns)
cmake_policy(SET CMP0020 NEW)
if(CMAKE_CROSSCOMPILING)
--
GitLab