Skip to content
Snippets Groups Projects
Commit f07a50f2 authored by Lars Bilke's avatar Lars Bilke
Browse files

Removed Conan Qt package.

parent b7025425
No related branches found
No related tags found
No related merge requests found
......@@ -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'")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment