diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2022-06-28 13:35:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 13:35:56 +0200 |
| commit | e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a (patch) | |
| tree | 7714844409ed8d84f5f408590b1d7cb82bfd5f0b /ci | |
| parent | 9e1474409934cda19e17d41a876415fc25022dce (diff) | |
| parent | 4c0c6f8428681c7ceef1148abe40b7d06079449c (diff) | |
| download | rneovim-e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a.tar.gz rneovim-e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a.tar.bz2 rneovim-e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a.zip | |
Merge #19120 build: rename build-related dirs
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/build.ps1 | 4 | ||||
| -rw-r--r-- | ci/common/build.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index 99f66f7de2..767f812091 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -71,9 +71,9 @@ function convertToCmakeArgs($vars) { cd $env:DEPS_BUILD_DIR if ($bits -eq 32) { - cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed + cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/cmake.deps/" ; exitIfFailed } else { - cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed + cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/cmake.deps/" ; exitIfFailed } cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed cd $buildDir diff --git a/ci/common/build.sh b/ci/common/build.sh index b8bbff0b16..f083796a28 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -35,7 +35,7 @@ build_deps() { # update CMake configuration and update to newer deps versions. cd "${DEPS_BUILD_DIR}" echo "Configuring with '${DEPS_CMAKE_FLAGS}'." - CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/third-party/" + CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/cmake.deps/" if ! top_make; then exit 1 |