update workflow

cpvrlab · Nov 20, 2023 · 7e7b11f · 7e7b11f
1 parent bb2d59d
commit 7e7b11f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build-dep-g2o.yml b/.github/workflows/build-dep-g2o.yml
@@ -13,10 +13,15 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - name: Install QT
+      run: choco install qt5-default
+
     - name: Run build script
       working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
       run: ./build_g2o_x64.bat
 
+
+
     - name: Archive prebuilt g2o
       uses: actions/upload-artifact@v3
       with:

diff --git a/externals/prebuild_scripts/build_g2o_x64.bat b/externals/prebuild_scripts/build_g2o_x64.bat
@@ -35,12 +35,12 @@ 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=A:\Qt\5.11.2\msvc2017_64\lib\cmake\Qt5
+::set QT_DIR=A:\Qt\5.11.2\msvc2017_64\lib\cmake\Qt5
 
 echo QGLVIEWER_DIR %QGLVIEWER_DIR%
 echo QGLVIEWER_DEBUG_LIB %QGLVIEWER_DEBUG_LIB%
 echo QGLVIEWER_RELEASE_LIB %QGLVIEWER_RELEASE_LIB%
-echo QT_DIR %QT_DIR%
+::echo QT_DIR %QT_DIR%
 echo INSTALL_DIR %INSTALL_DIR%
 ::-----------------------------------------------------------------::
 :: get eigen
@@ -67,8 +67,8 @@ git checkout %VERSION%
 mkdir %INSTALL_DIR%
 mkdir BUILD-vs
 cd BUILD-vs
-:: Removed -G %CMAKE_GENERATOR%
-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% -DQt5_DIR=%QT_DIR% -DQGLVIEWER_INCLUDE_DIR=%QGLVIEWER_DIR% -DQGLVIEWER_LIBRARY_DEBUG=%QGLVIEWER_DEBUG_LIB% -DQGLVIEWER_LIBRARY_RELEASE=%QGLVIEWER_RELEASE_LIB% -DCMAKE_INSTALL_PREFIX=%INSTALL_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
 cd ..\..