diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2019-12-20 17:05:39 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-12-20 16:11:33 +0000 |
| commit | 6a54209762e59c7ab90e0898347e52d0f343430a (patch) | |
| tree | ea8cf4ed5a85f118b59cbe6731a846fc01a2da20 /.github | |
| parent | 4bc38f11012471ce43a83e3d726815f35c7b2896 (diff) | |
CMake Build: Enable PCH build for GCC on GitHub Actions
Run configure twice, instead of disabling PCH!
Change-Id: I43d4e3123962a5a2eb1c539319eb5c36b3e18698
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index b3da98d079..6b04920936 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -207,28 +207,23 @@ jobs: file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/ninja" ninja_program) - # Workaround https://gitlab.kitware.com/cmake/cmake/issues/20119 - set(BUILD_WITH_PCH ON) - if ( "${{ matrix.config.cc }}" MATCHES "gcc") - set(BUILD_WITH_PCH OFF) - endif() - - execute_process( - COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake - -S . - -B build - -D CMAKE_BUILD_TYPE=${{ matrix.config.build_type }} - -D "CMAKE_PREFIX_PATH=${{ steps.libclang.outputs.libclang_dir }};${{ steps.qt.outputs.qt_dir }}" - -G Ninja - -D CMAKE_MAKE_PROGRAM=${ninja_program} - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE - -D BUILD_WITH_PCH=${BUILD_WITH_PCH} - RESULT_VARIABLE result - ) - if (NOT result EQUAL 0) - message(FATAL_ERROR "Bad exit status") - endif() - + # Workaround for https://gitlab.kitware.com/cmake/cmake/issues/20119 + foreach(step 1 2) + execute_process( + COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake + -S . + -B build + -D CMAKE_BUILD_TYPE=${{ matrix.config.build_type }} + -D "CMAKE_PREFIX_PATH=${{ steps.libclang.outputs.libclang_dir }};${{ steps.qt.outputs.qt_dir }}" + -G Ninja + -D CMAKE_MAKE_PROGRAM=${ninja_program} + -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE + RESULT_VARIABLE result + ) + if (NOT result EQUAL 0) + message(FATAL_ERROR "Bad exit status") + endif() + endforeach() - name: Build shell: cmake -P {0} |