merged RC_1_2 into master

2019-11-21 09:27:17 +01:00
parent 20f1bc2867
commit c05a815319
7 changed files with 44 additions and 25 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@ -108,7 +108,7 @@ build_script:
    mkdir build &&
    cd build &&
    cmake -DBOOST_LIBRARYDIR=%BOOST_ROOT%\stage\lib -DCMAKE_CXX_STANDARD=14 -Dbuild_tests=ON -Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=%python% -Dboost-python-module-name="python" -Dskip-python-runtime-test=true -DPython_ADDITIONAL_VERSIONS="2.7" -G "Visual Studio 15 2017" -A x64 .. &&
-    cmake --build . --config Release -- -verbosity:minimal
+    cmake --build . --config Release --parallel %NUMBER_OF_PROCESSORS% -- -verbosity:minimal
    )

 test_script: