Include python include patch

ITISFoundation · Dec 16, 2024 · ba08b91 · ba08b91
1 parent ad86559
commit ba08b91
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 47 deletions.
diff --git a/Makefile b/Makefile
@@ -27,11 +27,12 @@ get-dakota-src:
 		git submodule update --init packages/pecos && \
 		git submodule update --init packages/surfpack && \
 		git apply ../src_patches/findpython.patch && \
+		git apply ../src_patches/pythoninclude.patch && \
 		git apply ../src_patches/boost.patch && \
 		git apply ../src_patches/dakenv_restart.patch && \
 		git apply ../src_patches/cstdint_dak_types.patch && \
-		git apply --whitespace=nowarn ../src_patches/adaptsampl_batch.patch && \
-	    find . \( -name \*.cpp -o -name \*.hpp -o -name \*.c -o -name \*.h \) -exec \
-			sed -i -E -f ../src_patches/replace_old_macros_numpy.sed {} +
+		git apply --whitespace=nowarn ../src_patches/adaptsampl_batch.patch
+	  #   find . \( -name \*.cpp -o -name \*.hpp -o -name \*.c -o -name \*.h \) -exec \
+			# sed -i -E -f ../src_patches/replace_old_macros_numpy.sed {} +
 	cd dakota/packages/external && \
 		git apply ../../../src_patches/cstdint.patch
diff --git a/src_patches/dakota-src.patch b/src_patches/dakota-src.patch
diff --git a/src_patches/find_python.patch b/src_patches/find_python.patch
diff --git a/src_patches/pythoninclude.patch b/src_patches/pythoninclude.patch
@@ -11,7 +11,7 @@ index 1cce3d2..2670950 100644
 -    add_definitions("-DDAKOTA_PYTHON_LEGACY")
 -    list(APPEND EXT_TPL_LIBS ${Python_LIBRARIES})
 -  endif()
-+  # if(DAKOTA_PYTHON_DIRECT_INTERFACE_LEGACY) 
++  # 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})