update workflow

cpvrlab · Nov 20, 2023 · 241acde · 241acde
1 parent 464b307
commit 241acde
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/build-dep-g2o.yml b/.github/workflows/build-dep-g2o.yml
@@ -14,19 +14,19 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ilammy/msvc-dev-cmd@v1
 
-    - name: Download QT
-      run: curl.exe https://download.qt.io/official_releases/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.zip -o qt.zip
+    #- name: Download QT
+    #run: curl.exe https://download.qt.io/official_releases/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.zip -o qt.zip
 
-    - name: unpack QT
-      run: Expand-Archive .\qt.zip
+    #- name: unpack QT
+    #  run: Expand-Archive .\qt.zip
 
-    - name: configure QT
-      working-directory: qt-everywhere-src-5.15.11
-      run: ./configure -debug -nomake examples -nomake tests -skip qtwebengine -opensource
+    #- name: configure QT
+    #  working-directory: qt-everywhere-src-5.15.11
+    #  run: ./configure -debug -nomake examples -nomake tests -skip qtwebengine -opensource
 
-    - name: build QT
-      working-directory: qt-everywhere-src-5.15.11
-      run: nmake
+    #- name: build QT
+    #  working-directory: qt-everywhere-src-5.15.11
+    #  run: nmake
 
     - name: Run build script
       working-directory: ${{ github.workspace }}/externals/prebuild_scripts/

diff --git a/externals/prebuild_scripts/build_g2o_x64.bat b/externals/prebuild_scripts/build_g2o_x64.bat
@@ -35,6 +35,7 @@ set QGLVIEWER_DIR=%cd%\libQGLViewer\QGLViewer
 set QGLVIEWER_DEBUG_LIB=%cd%\libQGLViewer\QGLViewer\QGLViewerd2d.lib
 set QGLVIEWER_RELEASE_LIB=%cd%\libQGLViewer\QGLViewer\QGLViewerd2.lib
 set INSTALL_DIR=%cd%\g2o\INSTALL-vs
+::set QT_DIR=C:\ProgramData\chocolatey\lib\mingw\tools\install
 ::set QT_DIR=A:\Qt\5.11.2\msvc2017_64\lib\cmake\Qt5
 
 echo QGLVIEWER_DIR %QGLVIEWER_DIR%
@@ -67,7 +68,7 @@ git checkout %VERSION%
 mkdir %INSTALL_DIR%
 mkdir BUILD-vs
 cd BUILD-vs
-:: Removed -G %CMAKE_GENERATOR% -DQt5_DIR=%QT_DIR%
+:: Removed -G %CMAKE_GENERATOR%  -DQt5_DIR=%QT_DIR%
 cmake -A %CMAKE_ARCHITECTURE% -DEIGEN3_INCLUDE_DIR=..\eigen -DEigen3_DIR=..\eigen -DG2O_BUILD_APPS=%BUILD_APPS% -DG2O_BUILD_EXAMPLES=%BUILD_EXAMPLES% -DG2O_USE_CSPARSE=%USE_CSPARSE% -DG2O_USE_CHOLMOD=%USE_CHOLMOD% -DG2O_USE_OPENGL=%USE_OPENGL%  -DQGLVIEWER_INCLUDE_DIR=%QGLVIEWER_DIR% -DQGLVIEWER_LIBRARY_DEBUG=%QGLVIEWER_DEBUG_LIB% -DQGLVIEWER_LIBRARY_RELEASE=%QGLVIEWER_RELEASE_LIB% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..
 msbuild INSTALL.vcxproj -maxcpucount:%MAX_NUM_CPU_CORES% /p:Configuration=Debug
 msbuild INSTALL.vcxproj -maxcpucount:%MAX_NUM_CPU_CORES% /p:Configuration=Release