Fix toolchain path

PhotonVision · Apr 27, 2022 · e7679c5 · e7679c5
1 parent 26cb943
commit e7679c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -47,7 +47,7 @@ jobs:
           path: |
             build/*.so
             build/Debug/*.dll
-            build/*.dylib
+            build/libapriltag.dylib
 
   apriltag-build-docker:
     strategy:
@@ -75,15 +75,15 @@ jobs:
           cmake --build build
         if: matrix.artifact-name != 'Raspbian'
       - run: |
-          cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../CMake/arm-pi-gnueabihf.toolchain.cmake
+          cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="CMake/arm-pi-gnueabihf.toolchain.cmake"
           cmake --build build
         if: matrix.artifact-name == 'Raspbian'
 
       # Upload client artifact.
       - uses: actions/upload-artifact@master
         with:
           name: apriltag-${{ matrix.artifact-name }}
-          path: build/*.so
+          path: build/libapriltag.so
 
   apriltag-release:
     needs: [apriltag-build-host, apriltag-build-docker]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,12 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 option(ASAN "Use AddressSanitizer for debug builds to detect memory issues" OFF)
 option(BUILD_OPENCV_DEMO "Build OpenCV Demo" OFF)
 
+if(CMAKE_TOOLCHAIN_FILE)
+    message(STATUS "Toolchain: ${CMAKE_TOOLCHAIN_FILE}")
+else()
+    message(STATUS "No toolchain specified")
+endif()
+
 if (ASAN)
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} \
         -fsanitize=address \