From c134e16f1410785f5bba317eed177b7b1a28f557 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Sat, 4 Nov 2023 18:29:01 +0200 Subject: [PATCH] build: use CXXFLAGS to add flags Setting CMAKE_CXX_FLAGS on the command line overrides the defaults generated by CMake. We want to add flags to the compiler command line, hence CXXFLAGS is the correct variable. - fix some typos - reformat run parts to improve readability --- .github/workflows/build-windows.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index d8f4ea3..8d817e7 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -27,10 +27,10 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 - - name: install node + - name: Install node uses: actions/setup-node@master - - name: Install node-gpy + - name: Install node-gyp shell: powershell run: | npm install --global node-gyp@latest @@ -52,7 +52,12 @@ jobs: setup-python: false - name: Configure - run: cmake -B ${{ runner.temp }}/build . "-DCMAKE_CXX_FLAGS=-I${{ github.workspace }}/scrypt-windows/scrypt-1.1.6/lib" -DCMAKE_LIBRARY_PATH=${{ github.workspace }}/scrypt-windows/build/Release + run: > + cmake -B ${{ runner.temp }}/build + "-DCXXFLAGS=-I${{ github.workspace }}/scrypt-windows/scrypt-1.1.6/lib" + "-DCMAKE_LIBRARY_PATH=${{ github.workspace }}/scrypt-windows/build/Release" + . - name: Build - run: cmake --build ${{ runner.temp }}/build + run: | + cmake --build ${{ runner.temp }}/build