Skip to content

Commit 15415f9

Browse files
authored
Merge pull request #1799 from pmienk/master
Regenerate with updates.
2 parents aea4fd7 + efe63fa commit 15415f9

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,9 @@ jobs:
441441
echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV
442442
fi
443443
if [[ ${{ matrix.assert }} == 'ndebug' ]]; then
444-
echo "ASSERT_NDEBUG=--enable-ndebug -Denable-ndebug=yes" >> $GITHUB_ENV
444+
echo "ASSERT_NDEBUG=--enable-ndebug" >> $GITHUB_ENV
445445
else
446-
echo "ASSERT_NDEBUG=--disable-ndebug -Denable-ndebug=no" >> $GITHUB_ENV
446+
echo "ASSERT_NDEBUG=--disable-ndebug" >> $GITHUB_ENV
447447
fi
448448
if [[ ${{ matrix.link }} == 'dynamic' ]]; then
449449
echo "LINKAGE=--disable-static" >> $GITHUB_ENV
@@ -673,9 +673,9 @@ jobs:
673673
echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV
674674
fi
675675
if [[ ${{ matrix.assert }} == 'ndebug' ]]; then
676-
echo "ASSERT_NDEBUG=--enable-ndebug -Denable-ndebug=yes" >> $GITHUB_ENV
676+
echo "ASSERT_NDEBUG=--enable-ndebug" >> $GITHUB_ENV
677677
else
678-
echo "ASSERT_NDEBUG=--disable-ndebug -Denable-ndebug=no" >> $GITHUB_ENV
678+
echo "ASSERT_NDEBUG=--disable-ndebug" >> $GITHUB_ENV
679679
fi
680680
if [[ ${{ matrix.link }} == 'dynamic' ]]; then
681681
echo "LINKAGE=--disable-static" >> $GITHUB_ENV
@@ -818,7 +818,7 @@ jobs:
818818

819819
steps:
820820
- name: Add msbuild to PATH
821-
uses: microsoft/setup-msbuild@v2
821+
uses: microsoft/setup-msbuild@v3
822822
with:
823823
msbuild-architecture: x64
824824

install-cmake.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ create_directory()
8484
local DIRECTORY="$1"
8585

8686
rm -rf "$DIRECTORY"
87-
mkdir "$DIRECTORY"
87+
mkdir -p "$DIRECTORY"
8888
}
8989

9090
display_heading_message()

install-cmakepresets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ create_directory()
9090
local DIRECTORY="$1"
9191

9292
rm -rf "$DIRECTORY"
93-
mkdir "$DIRECTORY"
93+
mkdir -p "$DIRECTORY"
9494
}
9595

9696
display_heading_message()

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ create_directory()
8484
local DIRECTORY="$1"
8585

8686
rm -rf "$DIRECTORY"
87-
mkdir "$DIRECTORY"
87+
mkdir -p "$DIRECTORY"
8888
}
8989

9090
display_heading_message()

0 commit comments

Comments
 (0)