From 2c9f373472635ee7b43552e207f742f742ae4c58 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Wed, 27 Dec 2023 09:29:14 +0100 Subject: [PATCH] Patch dakota source to remove embedded python --- Makefile | 3 ++- dakota-src.patch | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dakota-src.patch diff --git a/Makefile b/Makefile index f1ad113..10ff7a3 100644 --- a/Makefile +++ b/Makefile @@ -19,4 +19,5 @@ get-dakota-src: cd dakota && \ git submodule update --init packages/external && \ git submodule update --init packages/pecos && \ - git submodule update --init packages/surfpack + git submodule update --init packages/surfpack && \ + git apply ../dakota-src.patch diff --git a/dakota-src.patch b/dakota-src.patch new file mode 100644 index 0000000..b1655b8 --- /dev/null +++ b/dakota-src.patch @@ -0,0 +1,21 @@ +diff --git a/cmake/DakotaFindPython.cmake b/cmake/DakotaFindPython.cmake +index 43f9fb9..f4c4e28 100644 +--- a/cmake/DakotaFindPython.cmake ++++ b/cmake/DakotaFindPython.cmake +@@ -8,7 +8,7 @@ macro(dakota_find_python) + if(DAKOTA_PYTHON_DIRECT_INTERFACE OR DAKOTA_PYTHON_SURROGATES OR + DAKOTA_PYTHON_WRAPPER OR DAKOTA_PYBIND11) + message(STATUS "Dakota enabling Python (Development) for direct or surrogate interface") +- list(APPEND dakota_python_components Development) ++ list(APPEND dakota_python_components Development.Module) + + if (DAKOTA_PYTHON_DIRECT_INTERFACE_NUMPY) + message(STATUS "Dakota enabling Python direct interface with NumPy") +@@ -18,6 +18,7 @@ macro(dakota_find_python) + endif() + + find_package(Python REQUIRED ${dakota_python_components}) ++ # find_package(Python COMPONENTS ${dakota_python_components} REQUIRED) + + # pybind11, C3, Acro, etc., use older CMake FindPythonInterp, so we + # coerce it to use same as Dakota; more complex situations may