[CMake] Find Qt5::X11Extras on Linux with Conan.

ufz · Jul 5, 2018 · 7734629 · 7734629
1 parent 915e52a
commit 7734629
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
@@ -69,6 +69,9 @@ target_link_libraries(DataExplorer
 if(NOT APPLE AND OGS_USE_CONAN)
     # HACK for unresolved external
     target_link_libraries(DataExplorer vtkGUISupportQt-8.1)
+    if(UNIX)
+        target_link_libraries(DataExplorer Qt5::X11Extras)
+    endif()
 endif()
 
 # Workaround for Windows conan tiff-package

diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
@@ -97,7 +97,11 @@ find_package(Metis QUIET)
 
 ## Qt5 library ##
 if(OGS_BUILD_GUI)
-    find_package(Qt5 5.2 REQUIRED Gui Widgets Xml XmlPatterns)
+    set(QT_MODULES Gui Widgets Xml XmlPatterns)
+    if(OGS_USE_CONAN AND UNIX AND NOT APPLE)
+        set(QT_MODULES ${QT_MODULES} X11Extras)
+    endif()
+    find_package(Qt5 5.2 REQUIRED ${QT_MODULES})
     cmake_policy(SET CMP0020 NEW)
     set(CMAKE_AUTOMOC TRUE)
     set(CMAKE_AUTOUIC TRUE)