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

Merge branch 'fix-ci' into 'master'

[ci] PETSc pkg-config fixes

See merge request ogs/ogs!4844
parents 07f521de 42017b54
No related branches found
No related tags found
No related merge requests found
Subproject commit a3007dbcaaffe840ffe400a03cf5358dd65b15f5 Subproject commit f67a7bfd0198d932a6c8fdaf66af64e8562e0558
...@@ -44,7 +44,7 @@ function(_check_header_compilation target) ...@@ -44,7 +44,7 @@ function(_check_header_compilation target)
Eigen3::Eigen Eigen3::Eigen
nlohmann_json::nlohmann_json nlohmann_json::nlohmann_json
range-v3 range-v3
# petsc; is given via ${PETSC_INCLUDES} below. PkgConfig::PETSC
) )
# Ignore non-existing targets or interface libs # Ignore non-existing targets or interface libs
if(NOT TARGET ${lib}) if(NOT TARGET ${lib})
...@@ -73,7 +73,7 @@ function(_check_header_compilation target) ...@@ -73,7 +73,7 @@ function(_check_header_compilation target)
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
# cmake-lint: disable=C0103 # cmake-lint: disable=C0103
set(CMAKE_REQUIRED_INCLUDES ${INCLUDE_DIRS} ${SOURCE_DIR} ${PETSC_INCLUDES}) set(CMAKE_REQUIRED_INCLUDES ${INCLUDE_DIRS} ${SOURCE_DIR})
# HACK, maybe add Gui Widgets Xml XmlPatterns as well # HACK, maybe add Gui Widgets Xml XmlPatterns as well
if(OGS_BUILD_GUI) if(OGS_BUILD_GUI)
set(CMAKE_REQUIRED_INCLUDES set(CMAKE_REQUIRED_INCLUDES
......
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