diff --git a/.github/workflows/build-container-and-wsl.yaml b/.github/workflows/build-container-and-wsl.yaml index 7f5fe052..7bc2e226 100644 --- a/.github/workflows/build-container-and-wsl.yaml +++ b/.github/workflows/build-container-and-wsl.yaml @@ -32,7 +32,7 @@ jobs: uses: docker/build-push-action@v2 with: file: ./portable.Dockerfile - platforms: linux/amd64,linux/386 + platforms: linux/amd64 push: true load: true # Copy to the host's docker daemon so we can use it for WSL export tags: ${{ steps.docker_meta.outputs.tags }} diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 140769b7..e86d2700 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -159,5 +159,5 @@ externalproject_add(lastools UPDATE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND make -C LASlib -j${nproc} CXXFLAGS='-std=c++11' && make -C src -j${nproc} CXXFLAGS='-std=c++11' lasmerge - INSTALL_COMMAND mkdir -p ${SB_INSTALL_DIR}/bin && mv ${SB_SOURCE_DIR}/lastools/bin/lasmerge ${SB_INSTALL_DIR}/bin + INSTALL_COMMAND install -m755 -D -t ${SB_INSTALL_DIR}/bin ${SB_SOURCE_DIR}/lastools/bin/lasmerge )