Reset cmake.yml

echoix · Apr 23, 2024 · 5eb31ff · 5eb31ff
1 parent a5b8240
commit 5eb31ff
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -44,13 +44,13 @@ jobs:
                   restore-keys: |
                     ${{ env.cache-name }}-${{ runner.os }}-${{ github.base_ref }}
                     ${{ env.cache-name }}-${{ runner.os }}
-            #- name: Install CMake 3.16.0
-              #run: |
-                #cd ${GITHUB_WORKSPACE}
-                #wget https://github.com/Kitware/CMake/releases/download/v3.16.0/cmake-3.16.0-Linux-x86_64.tar.gz
-                #tar xzf cmake-3.16.0-Linux-x86_64.tar.gz
-                #echo "CMAKE_DIR=$GITHUB_WORKSPACE/cmake-3.16.0-Linux-x86_64/bin" >> $GITHUB_ENV
-                #echo "$GITHUB_WORKSPACE/cmake-3.16.0-Linux-x86_64/bin" >> $GITHUB_PATH
+            - name: Install CMake 3.16.0
+              run: |
+                cd ${GITHUB_WORKSPACE}
+                wget https://github.com/Kitware/CMake/releases/download/v3.16.0/cmake-3.16.0-Linux-x86_64.tar.gz
+                tar xzf cmake-3.16.0-Linux-x86_64.tar.gz
+                echo "CMAKE_DIR=$GITHUB_WORKSPACE/cmake-3.16.0-Linux-x86_64/bin" >> $GITHUB_ENV
+                echo "$GITHUB_WORKSPACE/cmake-3.16.0-Linux-x86_64/bin" >> $GITHUB_PATH
             - run: |
                 cmake --version
             - name: Install dependencies
@@ -71,8 +71,8 @@ jobs:
                  libboost-thread-dev libboost-program-options-dev libpdal-dev\
                  subversion libzstd-dev checkinstall \
                  libglu1-mesa-dev libxmu-dev \
-                 ghostscript wget -y make ccache g++ ninja-build
-            #- run: python -m pip install ninja
+                 ghostscript wget -y make ccache g++
+            - run: python -m pip install ninja
             - name: Configure ccache
               run: |
                   echo CCACHE_BASEDIR=$PWD >> ${GITHUB_ENV}
@@ -82,9 +82,9 @@ jobs:
               working-directory: ${{ github.workspace }}
             - name: Configure
               run: |
-                cmake ${CMAKE_OPTIONS} -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -G Ninja
+                cmake ${CMAKE_OPTIONS} -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
             - name: Build
               run: |
                 cmake --build $GITHUB_WORKSPACE/build --verbose -j$(nproc)
             - name: ccache statistics
-              run: ccache -s
+              run: ccache -s