-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
39 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/cmake/DakotaFindPython.cmake b/cmake/DakotaFindPython.cmake | ||
index 9ffa1ca..d7a2152 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_LEGACY) | ||
if (DAKOTA_PYTHON_DIRECT_INTERFACE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 1cce3d2..2670950 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -325,11 +325,11 @@ if(DAKOTA_PYTHON_DIRECT_INTERFACE) | ||
# TODO: Use target_definitions | ||
# If not, use Python_LIBRARY_DIRS | ||
|
||
- if(DAKOTA_PYTHON_DIRECT_INTERFACE_LEGACY) | ||
- list(APPEND EXT_TPL_INCDIRS ${Python_INCLUDE_DIRS}) | ||
- add_definitions("-DDAKOTA_PYTHON_LEGACY") | ||
- list(APPEND EXT_TPL_LIBS ${Python_LIBRARIES}) | ||
- endif() | ||
+ # if(DAKOTA_PYTHON_DIRECT_INTERFACE_LEGACY) | ||
+ list(APPEND EXT_TPL_INCDIRS ${Python_INCLUDE_DIRS}) | ||
+ # add_definitions("-DDAKOTA_PYTHON_LEGACY") | ||
+ list(APPEND EXT_TPL_LIBS ${Python_LIBRARIES}) | ||
+ # endif() | ||
# Pybind11 is also included alongside older Python interface | ||
list(APPEND EXT_TPL_INCDIRS ${pybind11_INCLUDE_DIR}) | ||
add_definitions("-DDAKOTA_PYBIND11") |