Skip to content
Snippets Groups Projects
Commit 108cdd9d authored by Santiago Ospina De Los Ríos's avatar Santiago Ospina De Los Ríos
Browse files

Try again patches on windows

parent 6500bb30
No related branches found
No related tags found
1 merge request!49Resolve "Finish installation and usage instruction on the documentation"
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 1c9b0412..778c9a92 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -977,8 +977,6 @@ endif()
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
endif()
- include(CPack)
-
feature_summary(WHAT ALL)
# check if CXX flag overloading has been enabled
diff --git a/dune/common/std/CMakeLists.txt b/dune/common/std/CMakeLists.txt
index 40004d3c..94a2d7ac 100644
--- a/dune/common/std/CMakeLists.txt
......
......@@ -62,8 +62,11 @@ SETUP_dune_testtools_BRANCH="releases/2.7"
SETUP_dune_testtools_REPO="https://gitlab.dune-project.org/quality/dune-testtools.git"
cat ${SCRIPT_DIR}/dune-common.patch >> "${PWD}/dune-common.patch"
curl https://gist.githubusercontent.com/lkeegan/059984b71f8aeb0bbc062e85ad7ee377/raw/e9c7af42c47fe765547e60833a72b5ff1e78123c/cmake-patch.txt >> "${PWD}/dune-common.patch"
printf "\n" >> "${PWD}/dune-common.patch"
if [[ "$OS_TARGET" == *"osx"* ]]; then
curl https://gist.githubusercontent.com/lkeegan/059984b71f8aeb0bbc062e85ad7ee377/raw/e9c7af42c47fe765547e60833a72b5ff1e78123c/cmake-patch.txt >> "${PWD}/dune-common.patch"
printf "\n" >> "${PWD}/dune-common.patch"
fi
SETUP_dune_common_PATCHES="${PWD}/dune-common.patch"
......@@ -152,10 +155,8 @@ for module in $MODULES; do
fi
# apply patches
for patch in $PATCHES; do
echo "Applying patch: $patch"
git -C dune-$module apply $patch
done
echo "Applying patches: $PATCHES"
git -C dune-$module apply -v $PATCHES
echo ""
if [ "$module" = "common" ]; then
......
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