From f07a50f2586d0bc0185bcb5f96c6a96f19db554a Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 5 Jul 2021 13:05:45 +0200
Subject: [PATCH] Removed Conan Qt package.
---
scripts/cmake/ConanSetup.cmake | 43 ----------------------------------
1 file changed, 43 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 744bb21a546..f705c045fef 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -37,39 +37,6 @@ if(OGS_USE_LIS)
set(CONAN_REQUIRES ${CONAN_REQUIRES} lis/1.7.37@bilke/stable)
endif()
-if(OGS_BUILD_GUI)
- set(QT_VERSION ${ogs.minimum_version.qt})
- if(UNIX)
- set(QT_VERSION ${ogs.tested_version.qt})
- endif()
- set(CONAN_REQUIRES ${CONAN_REQUIRES}
- # libgeotiff/1.4.2@bilke/stable # TODO
- # Overrides for dependency mismatches
- bzip2/1.0.8
- zlib/1.2.11
- qt/${QT_VERSION}@bincrafters/stable
- )
- set(CONAN_OPTIONS ${CONAN_OPTIONS}
- qt:qtxmlpatterns=True
- qt:openssl=False
- qt:with_libalsa=False
- qt:with_libjpeg=False
- #qt:with_libpng=False
- qt:with_mysql=False
- qt:with_odbc=False
- qt:with_openal=False
- qt:with_pq=False
- qt:with_sdl2=False
- qt:with_sqlite3=False
- )
- if(MSVC)
- set(CONAN_OPTIONS ${CONAN_OPTIONS} qt:with_harfbuzz=False)
- endif()
- if(UNIX AND NOT APPLE)
- list(APPEND CONAN_OPTIONS qt:qtx11extras=True)
- endif()
-endif()
-
if(OGS_USE_NETCDF)
set(CONAN_REQUIRES ${CONAN_REQUIRES} netcdf-cxx/4.3.1-1@bilke/testing)
endif()
@@ -116,12 +83,6 @@ else()
set(CONAN_BUILD_TYPE ${CMAKE_BUILD_TYPE})
endif()
-if(MSVC)
- set(CC_CACHE $ENV{CC})
- set(CXX_CACHE $ENV{CXX})
- unset(ENV{CC}) # Disable clcache, e.g. for building qt
- unset(ENV{CXX})
-endif()
# speed up conan_cmake_run
set(ARGUMENTS_CONAN_COMMAND ${CONAN_CMD} CACHE INTERNAL "")
conan_cmake_run(
@@ -135,10 +96,6 @@ conan_cmake_run(
GENERATORS virtualrunenv
BUILD_TYPE ${CONAN_BUILD_TYPE}
)
-if(MSVC)
- set(ENV{CC} ${CC_CACHE}) # Restore vars
- set(ENV{CXX} ${CXX_CACHE})
-endif()
if(NOT ${OGS_CONAN_BUILD} MATCHES "never|always|missing|outdated")
message(STATUS "Warning: Resetting CMake variable OGS_CONAN_BUILD to its default value of 'missing'")
--
GitLab