diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt index 0f05dccec884719f496487e36b9ec791da523a03..8c5ce146dfa56644a2d67021980c4616d0d2018a 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 03f5544798865d25e8b5a0d0ac35e7969f341c25..a6e347979325e13f94cd4c59e15487fe7c055bfc 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 98e7288d7b977809ab51c280bd77a4a2b3dd0da8..d8cbb79405afd3a81763c461d6998055237ecb9f 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)