From e61358744175558a9de8a409e0590eef01f6d045 Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@googlemail.com>
Date: Tue, 1 Oct 2019 17:22:39 +0200
Subject: [PATCH] [cmake] unset PYTHON_LIBRARY before searching for
PythonLibsNew
---
.gitsuper | 92 ++++++++++++++------------
cmake/modules/DunePybindxiMacros.cmake | 2 +
2 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/.gitsuper b/.gitsuper
index 08a803ecf..d3b706ca5 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -1,41 +1,42 @@
[supermodule]
remote = git@github.com:dune-community/dune-gdt-super.git
-status = 4aa3135a5539b1109df09c0c311b2c7fbf601467 .ci/shared (heads/master)
+status = 37afc034878b25dae654557ef95ee36edf9b9e1b .ci/shared (heads/master)
1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
- 5b0bde4070bc5f34516a9774830a2a0dae8480a7 config.opts (heads/master)
+ 911325d8c3654e857cc9562ce6ce01ef2f96e3d5 config.opts (heads/hapod2)
f308c6637edd65dcb83c4c1a46feaf05b958130e dune-alugrid (v2.6.0-7-gf308c663)
76d7f0c9886a061571cb8dc66dd45a4ef86e7a58 dune-common (v2.2.1-2269-g76d7f0c9)
- +523f8bec4997cd25e1cb4c6d7686044aec148925 dune-gdt (heads/dailywork_tleibner)
- 5235397bc16d24c759a1672fed7b8cfde4852e52 dune-geometry (v2.2.0-834-g5235397)
+ 7be04ad07fa8dbb42611c7da0d2c4ec76dbe659a dune-gdt (heads/hapod2)
+ e54b8541ffde1392a734b54f6d3243d616cfd8b6 dune-geometry (v2.2.0-860-ge54b854)
af5766f0df47e3d0b62ea486efb9cdbf8e1cfc52 dune-grid (v2.2.0-2671-gaf5766f0d)
1369ae9329d0928480d6b18ed772fc77e1abf752 dune-grid-glue (v2.4.0-161-g1369ae9)
ef68ae0ec40f9d369e4ea9b31e560af6af545bf6 dune-istl (v2.6.0-4-gef68ae0e)
- 5a1f77d7a0a41c2d065b29f00dda0871ec70337b dune-localfunctions (v2.6.0-2-g5a1f77d)
- +4f611e02ddedc4ec0f26dfa0d36fe99a1e39b1e6 dune-pybindxi (v2.2.1-35-g4f611e0)
- 58bd932e2311a288e0163d041f836b50f19111cb dune-testtools (remotes/origin/testname_listing_hack2.6)
+ ee794bfdfa3d4f674664b4155b6b2df36649435f dune-localfunctions (v2.6.0-4-gee794bf)
+ ed110baefb1e18c9e36961bfa6f1791f40c0b28b dune-pybindxi (v2.2.1-35-ged110ba)
+ 9543b4e8539dcccadc920ac1ca72c81ad807c73f dune-testtools (remotes/origin/testname_listing_hack2.6)
07f9700459c616186737a9a34277f2edee76f475 dune-uggrid (v2.6.0-1-g07f97004)
- +1dc60484fc0d5324a6e57cd51efc7dfaf052d6e9 dune-xt-common (heads/dailywork_tleibner)
- 3e92687f37f40a53f2ed513e8a9e375a2f8100ba dune-xt-data (heads/master)
- +aeee56101421afd629f9a684b334d46edc03cef5 dune-xt-functions (heads/dailywork_tleibner)
- b690c5025c3a1ad8275b07c4e501535645b4583a dune-xt-grid (heads/master)
- c4a4de3b7ae98005dc40724934f66a58f01cfd32 dune-xt-la (heads/master)
+ +b9a7393df1398ba36af5a568a16b26c3e9f6f4e7 dune-xt-common (heads/hapod2)
+ 482fca5121701b69d4c5071c22d28cfe043b464c dune-xt-data (heads/master)
+ 08856dea0bdac4e130dbdd087b7d58e7e1eb5c64 dune-xt-functions (heads/master)
+ 2815c16b3125b1fa98d697bd8c3bf78e6127672c dune-xt-grid (remotes/origin/HEAD)
+ 811eb98d02937130b40e802fbbfa54b956683814 dune-xt-la (heads/hapod2)
+ a7de2e3335174a559e1d34f7ded0e45208f86617 pymor (2019.2rc0-543-ga7de2e33)
09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
-commit = 7f523c6084d251cb6cb04f2b367277fe9f7f459f
+commit = 136badd67d4e370e868725a3480a348b55b30de7
[submodule.shared]
remote = https://github.com/dune-community/dune-xt-ci
status =
-commit = 4aa3135a5539b1109df09c0c311b2c7fbf601467
+commit = 37afc034878b25dae654557ef95ee36edf9b9e1b
[submodule.bin]
-remote = git@github.com:dune-community/local-bin.git
+remote = https://github.com/dune-community/local-bin.git
status =
commit = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8
[submodule.config.opts]
-remote = git@github.com:dune-community/config.opts.git
+remote = https://github.com/dune-community/config.opts.git
status =
-commit = 5b0bde4070bc5f34516a9774830a2a0dae8480a7
+commit = 911325d8c3654e857cc9562ce6ce01ef2f96e3d5
[submodule.dune-alugrid]
remote = https://github.com/dune-mirrors/dune-alugrid.git
@@ -43,23 +44,23 @@ status =
commit = f308c6637edd65dcb83c4c1a46feaf05b958130e
[submodule.dune-common]
-remote = git@github.com:dune-community/dune-common.git
+remote = https://github.com/dune-community/dune-common.git
status =
commit = 76d7f0c9886a061571cb8dc66dd45a4ef86e7a58
[submodule.dune-gdt]
remote = git@github.com:dune-community/dune-gdt.git
-status = 4aa3135a5539b1109df09c0c311b2c7fbf601467 .ci/shared (heads/master)
+status = cc324c2a418c2e10cca465da7aeb81bd9201a462 .ci/shared (heads/master)
1f967c99ec990e557ad7b39a25c0148886019b79 .vcsetup (heads/master)
-commit = 523f8bec4997cd25e1cb4c6d7686044aec148925
+commit = 7be04ad07fa8dbb42611c7da0d2c4ec76dbe659a
[submodule.dune-geometry]
-remote = git@github.com:dune-community/dune-geometry.git
+remote = https://github.com/dune-community/dune-geometry.git
status =
-commit = 5235397bc16d24c759a1672fed7b8cfde4852e52
+commit = e54b8541ffde1392a734b54f6d3243d616cfd8b6
[submodule.dune-grid]
-remote = git@github.com:dune-community/dune-grid.git
+remote = https://github.com/dune-community/dune-grid.git
status =
commit = af5766f0df47e3d0b62ea486efb9cdbf8e1cfc52
@@ -76,17 +77,17 @@ commit = ef68ae0ec40f9d369e4ea9b31e560af6af545bf6
[submodule.dune-localfunctions]
remote = https://github.com/dune-mirrors/dune-localfunctions.git
status =
-commit = 5a1f77d7a0a41c2d065b29f00dda0871ec70337b
+commit = ee794bfdfa3d4f674664b4155b6b2df36649435f
[submodule.dune-pybindxi]
-remote = git@github.com:dune-community/dune-pybindxi.git
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 4f611e02ddedc4ec0f26dfa0d36fe99a1e39b1e6
+remote = https://github.com/dune-community/dune-pybindxi.git
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (c0b1735)
+commit = ed110baefb1e18c9e36961bfa6f1791f40c0b28b
[submodule.dune-testtools]
-remote = git@github.com:dune-community/dune-testtools.git
+remote = https://github.com/dune-community/dune-testtools.git
status =
-commit = 58bd932e2311a288e0163d041f836b50f19111cb
+commit = 9543b4e8539dcccadc920ac1ca72c81ad807c73f
[submodule.dune-uggrid]
remote = https://github.com/dune-mirrors/dune-uggrid.git
@@ -95,33 +96,38 @@ commit = 07f9700459c616186737a9a34277f2edee76f475
[submodule.dune-xt-common]
remote = git@github.com:dune-community/dune-xt-common.git
-status = 4aa3135a5539b1109df09c0c311b2c7fbf601467 .ci/shared (heads/master)
+status = 37afc034878b25dae654557ef95ee36edf9b9e1b .ci/shared (heads/master)
1f967c99ec990e557ad7b39a25c0148886019b79 .vcsetup (heads/master)
-commit = 1dc60484fc0d5324a6e57cd51efc7dfaf052d6e9
+commit = b9a7393df1398ba36af5a568a16b26c3e9f6f4e7
[submodule.dune-xt-data]
-remote = git@github.com:dune-community/dune-xt-data
-status = +4aa3135a5539b1109df09c0c311b2c7fbf601467 .ci/shared (heads/master)
+remote = https://github.com/dune-community/dune-xt-data
+status = 37afc034878b25dae654557ef95ee36edf9b9e1b .ci/shared (heads/master)
1f967c99ec990e557ad7b39a25c0148886019b79 .vcsetup (heads/master)
-commit = 3e92687f37f40a53f2ed513e8a9e375a2f8100ba
+commit = 482fca5121701b69d4c5071c22d28cfe043b464c
[submodule.dune-xt-functions]
-remote = git@github.com:dune-community/dune-xt-functions.git
-status = 4aa3135a5539b1109df09c0c311b2c7fbf601467 .ci/shared (heads/master)
+remote = https://github.com/dune-community/dune-xt-functions.git
+status = +37afc034878b25dae654557ef95ee36edf9b9e1b .ci/shared (heads/master)
1f967c99ec990e557ad7b39a25c0148886019b79 .vcsetup (heads/master)
-commit = aeee56101421afd629f9a684b334d46edc03cef5
+commit = 08856dea0bdac4e130dbdd087b7d58e7e1eb5c64
[submodule.dune-xt-grid]
-remote = git@github.com:dune-community/dune-xt-grid.git
-status = 4aa3135a5539b1109df09c0c311b2c7fbf601467 .ci/shared (heads/master)
+remote = https://github.com/dune-community/dune-xt-grid.git
+status = 37afc034878b25dae654557ef95ee36edf9b9e1b .ci/shared (heads/master)
1f967c99ec990e557ad7b39a25c0148886019b79 .vcsetup (heads/master)
-commit = b690c5025c3a1ad8275b07c4e501535645b4583a
+commit = 2815c16b3125b1fa98d697bd8c3bf78e6127672c
[submodule.dune-xt-la]
-remote = git@github.com:dune-community/dune-xt-la.git
-status = 4aa3135a5539b1109df09c0c311b2c7fbf601467 .ci/shared (heads/master)
+remote = https://github.com/dune-community/dune-xt-la.git
+status = 37afc034878b25dae654557ef95ee36edf9b9e1b .ci/shared (heads/master)
1f967c99ec990e557ad7b39a25c0148886019b79 .vcsetup (heads/master)
-commit = c4a4de3b7ae98005dc40724934f66a58f01cfd32
+commit = 811eb98d02937130b40e802fbbfa54b956683814
+
+[submodule.pymor]
+remote = git@github.com:pymor/pymor.git
+status =
+commit = a7de2e3335174a559e1d34f7ded0e45208f86617
[submodule.scripts]
remote = https://github.com/wwu-numerik/scripts.git
diff --git a/cmake/modules/DunePybindxiMacros.cmake b/cmake/modules/DunePybindxiMacros.cmake
index aedb5396e..ac5fee3c3 100644
--- a/cmake/modules/DunePybindxiMacros.cmake
+++ b/cmake/modules/DunePybindxiMacros.cmake
@@ -16,6 +16,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(DUNE_PYBINDXI_PYTHON_VERSION "" CACHE STRING "Python version to use for dune-pybindxi")
set(PYTHON_EXECUTABLE ${DUNE_PYTHON_VIRTUALENV_INTERPRETER})
+unset(PYTHON_LIBRARY)
+unset(PYTHON_LIBRARY CACHE)
find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} CACHE INTERNAL "")
--
GitLab