Skip to content

Commit 784e1b4

Browse files
committed
Update
1 parent 05273de commit 784e1b4

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ jobs:
4646
if: matrix.os != 'windows-latest'
4747
run: |
4848
micromamba activate pybind11_json
49-
cmake -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX -D DOWNLOAD_GTEST=ON -D PYTHON_EXECUTABLE=`which python` -D CMAKE_INSTALL_LIBDIR=lib ..
49+
cmake .. \
50+
-D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
51+
-D DOWNLOAD_GTEST=ON \
52+
-D PYTHON_EXECUTABLE=`which python` \
53+
-D CMAKE_INSTALL_LIBDIR=lib
5054
make install -j2
5155
working-directory: build
5256

@@ -55,15 +59,20 @@ jobs:
5559
shell: cmd
5660
run: |
5761
call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate pybind11_json
58-
cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX="%CONDA_PREFIX%\Library" -D DOWNLOAD_GTEST=ON -D PYTHON_EXECUTABLE=%CONDA_PREFIX%/python.exe -Dgtest_force_shared_crt=ON -DCMAKE_CXX_FLAGS=/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING ..
62+
cmake .. ^
63+
-G "NMake Makefiles" ^
64+
-D CMAKE_INSTALL_PREFIX="%CONDA_PREFIX%\Library" ^
65+
-D DOWNLOAD_GTEST=ON ^
66+
-D gtest_force_shared_crt=ON ^
67+
-D CMAKE_CXX_FLAGS=/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
5968
nmake install
6069
working-directory: build
6170

6271
- name: Unix, Run tests
6372
if: matrix.os != 'windows-latest'
6473
run: |
6574
micromamba activate pybind11_json
66-
test_pybind11_json
75+
./test_pybind11_json
6776
working-directory: build/test
6877

6978
- name: Windows, Run tests

0 commit comments

Comments
 (0)