fix build g2o symbol export windows and remov macArm64 in g2o

cpvrlab · Jan 21, 2024 · 7d52d2a · 7d52d2a
1 parent 8c8bec6
commit 7d52d2a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build-dep-g2o.yml b/.github/workflows/build-dep-g2o.yml
@@ -47,19 +47,19 @@ jobs:
       working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
       run: arch -x86_64 ./build_g2o_for_mac64.sh
 
-    - name: Run build script arm
-      working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
-      run: arch -arm64 ./build_g2o_for_macArm64.sh
+    #- name: Run build script arm
+    #  working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
+    #  run: arch -arm64 ./build_g2o_for_macArm64.sh
 
     - name: Archive prebuilt g2o intel
       uses: actions/upload-artifact@v3
       with:
         name: prebuilt-g2o-mac64
         path: ${{ github.workspace }}/externals/prebuilt/mac64_g2o
 
-    - name: Archive prebuilt g2o arm
-      uses: actions/upload-artifact@v3
-      with:
-        name: prebuilt-g2o-arm64
-        path: ${{ github.workspace }}/externals/prebuilt/macArm64_g2o
+    #- name: Archive prebuilt g2o arm
+    #  uses: actions/upload-artifact@v3
+    #  with:
+    #    name: prebuilt-g2o-arm64
+    #    path: ${{ github.workspace }}/externals/prebuilt/macArm64_g2o
 
diff --git a/.github/workflows/build-dep-opencv.yml b/.github/workflows/build-dep-opencv.yml
@@ -44,11 +44,11 @@ jobs:
     - uses: actions/checkout@v3
     - name: Run build script intel
       working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
-      run: arch -x86_64 ./build_opencv_w_contrib_for_mac64.sh 4.7.0
+      run: arch -x86_64 ./build_opencv_w_contrib_for_mac.sh 4.7.0
 
     - name: Archive prebuilt opencv intel
       uses: actions/upload-artifact@v3
       with:
-        name: prebuilt-opencv-mac64
-        path: ${{ github.workspace }}/externals/prebuilt/mac64_opencv_4.7.0
+        name: prebuilt-opencv-mac intel
+        path: ${{ github.workspace }}/externals/prebuild_scripts/opencv/build/mac64_opencv_4.7.0
 
diff --git a/externals/prebuild_scripts/build_g2o_x64.bat b/externals/prebuild_scripts/build_g2o_x64.bat
@@ -69,7 +69,7 @@ mkdir %INSTALL_DIR%
 mkdir BUILD-vs
 cd BUILD-vs
 :: 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% ..
+cmake -A %CMAKE_ARCHITECTURE% -DWINDOWS_EXPORT_ALL_SYMBOLS=ON -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 ..\..