Update submodules

evan1026 · May 12, 2022 · 0b00f69 · 0b00f69
1 parent 1b81e14
commit 0b00f69
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -5,6 +5,9 @@ on:
     branches:
       - master
 
+env:
+  DEPENDENCIES: libusb-1.0-0-dev libudev-dev gcovr cmake doxygen
+
 jobs:
   coverage:
     runs-on: ubuntu-latest
@@ -13,7 +16,7 @@ jobs:
         with:
           submodules: true
       - name: Install dependencies
-        run: sudo apt update -m && sudo apt install libusb-1.0-0-dev libhidapi-dev gcovr cmake doxygen
+        run: sudo apt update -m && sudo apt install $DEPENDENCIES
         shell: bash
       - name: Run CMake
         run: cd "${{ runner.temp }}" && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug "${{ github.workspace }}"
@@ -31,7 +34,7 @@ jobs:
         with:
           submodules: true
       - name: Install dependencies
-        run: sudo apt update -m && sudo apt install libusb-1.0-0-dev libhidapi-dev gcovr cmake doxygen
+        run: sudo apt update -m && sudo apt install $DEPENDENCIES
         shell: bash
       - name: Run CMake
         run: cd "${{ runner.temp }}" && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug "${{ github.workspace }}"

diff --git a/README.md b/README.md
@@ -2,4 +2,4 @@ master: ![](https://github.com/evan1026/blink1-control/workflows/C/C++%20CI/badg
 
 Required Libraries
 ------------------
-libusb-1.0-0-dev libhidapi-dev
+libusb-1.0-0-dev libudev-dev
diff --git a/cmake-modules b/cmake-modules
diff --git a/lib/blink1-tool b/lib/blink1-tool
diff --git a/lib/googletest b/lib/googletest
diff --git a/lib/json b/lib/json
diff --git a/test/blink-lib/FakeBlink1Lib.cpp b/test/blink-lib/FakeBlink1Lib.cpp
@@ -165,7 +165,7 @@ blink1_device* blink1_openById(uint32_t id) {
     return blink1_open();
 }
 
-void blink1_close(blink1_device* dev) {
+void blink1_close_internal(blink1_device* dev) {
     auto loc = std::find(fake_blink1_lib::blink1_devices.begin(), fake_blink1_lib::blink1_devices.end(), dev);
     if (loc != fake_blink1_lib::blink1_devices.end()) {
         fake_blink1_lib::blink1_devices.erase(loc);
+495 −83		CodeCoverage.cmake
+0 −14		CorrectWindowsPaths.cmake
+0 −20		DisableCompilerFlag.cmake
+0 −78		EnableExtraCompilerWarnings.cmake
+0 −101		FileCopyTargets.cmake
+7 −3		FindMKL.cmake
+0 −48		FindMSVCRedist.cmake
+0 −106		FindPackageMultipass.cmake
+0 −27		FindQVTK.cmake
+0 −48		Findcutil.cmake
+0 −181		GetCompilerInfoString.cmake
+0 −101		LibFindMacros.cmake
+0 −133		Licensing.cmake
+0 −53		ListCombinations.cmake
+0 −50		ListFilter.cmake
+0 −31		MSVCMultipleProcessCompile.cmake
+0 −33		MSVCStaticRuntime.cmake
+0 −48		MSVCVerboseLinking.cmake
+0 −5		README.md
+0 −105		ResolveCompilerPaths.cmake
+0 −114		UseBackportedModules.cmake
+0 −24		WarningDev.cmake
+0 −108		cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
+0 −363		cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
+0 −51		cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
+0 −131		cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
+0 −77		cmake-2.8.3-modules/FixWinInstallPrefix.cmake
+0 −13		cmake-2.8.3-modules/autoinclude.cmake
+0 −19		cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
+0 −13		cmake-2.8.4-modules/autoinclude.cmake
+0 −1,171		cmake-2.8.4-modules/boost/FindBoost.cmake
+0 −44		cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
+0 −13		cmake-2.9.0-modules/autoinclude.cmake
+13 −3		cotire.cmake
+0 −189		module-docs/Example-FindMyPackage.cmake
+0 −101		module-docs/Example-FindMySimplePackage.cmake
+0 −13		package-licensing/Boost.cmake
+0 −13		package-licensing/Eigen.cmake
+0 −13		package-licensing/Qt-LGPL.cmake