From 09920f713011ef8b7af489fcaef5abfa32afeb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3n=20Bjarni=20Bjarnason?= Date: Wed, 26 Jun 2024 11:21:11 +0000 Subject: [PATCH] removed hacks for mp units --- exes/ethercat/CMakeLists.txt | 1 - exes/tfcctl/CMakeLists.txt | 1 - libs/confman/testing/examples/CMakeLists.txt | 1 - libs/ipc/testing/examples/CMakeLists.txt | 1 - libs/motor/CMakeLists.txt | 1 - libs/stx/CMakeLists.txt | 1 - vcpkg-configuration.json | 2 +- 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/exes/ethercat/CMakeLists.txt b/exes/ethercat/CMakeLists.txt index bc98793f2b..1fe8eef5e4 100644 --- a/exes/ethercat/CMakeLists.txt +++ b/exes/ethercat/CMakeLists.txt @@ -3,7 +3,6 @@ project(ec) find_path(BEXT_SML_INCLUDE_DIRS "boost/sml.hpp") find_package(fmt CONFIG REQUIRED) find_package(soem CONFIG REQUIRED) -find_package(gsl-lite CONFIG REQUIRED) # todo remove when mp-units find_package(mp-units CONFIG REQUIRED) add_library(ec src/ec.cpp src/devices/beckhoff.cpp src/common.cpp) diff --git a/exes/tfcctl/CMakeLists.txt b/exes/tfcctl/CMakeLists.txt index 6e3a2d9fcb..58704a9ada 100644 --- a/exes/tfcctl/CMakeLists.txt +++ b/exes/tfcctl/CMakeLists.txt @@ -1,7 +1,6 @@ add_executable(tfcctl src/tfcctl.cpp) find_package(Boost REQUIRED COMPONENTS program_options) -find_package(gsl-lite CONFIG REQUIRED) # todo remove when mp-units does this on its own find_package(mp-units CONFIG REQUIRED) target_link_libraries(tfcctl diff --git a/libs/confman/testing/examples/CMakeLists.txt b/libs/confman/testing/examples/CMakeLists.txt index 4270fe5532..20c7f73773 100644 --- a/libs/confman/testing/examples/CMakeLists.txt +++ b/libs/confman/testing/examples/CMakeLists.txt @@ -1,4 +1,3 @@ -find_package(gsl-lite CONFIG REQUIRED) # todo remove, mp-units should take care of this find_package(mp-units CONFIG REQUIRED) find_package(fmt CONFIG REQUIRED) diff --git a/libs/ipc/testing/examples/CMakeLists.txt b/libs/ipc/testing/examples/CMakeLists.txt index f03fa72a0e..a454bee7e2 100644 --- a/libs/ipc/testing/examples/CMakeLists.txt +++ b/libs/ipc/testing/examples/CMakeLists.txt @@ -7,7 +7,6 @@ target_link_libraries(print_signals_and_slots PRIVATE tfc::base tfc::ipc) tfc_add_example_no_test(ipc_coroutines ipc_coroutines.cpp) target_link_libraries(ipc_coroutines PRIVATE tfc::base tfc::ipc) -find_package(gsl-lite CONFIG REQUIRED) # todo remove, mp-units should take care of this find_package(mp-units CONFIG REQUIRED) find_package(fmt CONFIG REQUIRED) tfc_add_example_no_test(mass_example mass_example.cpp) diff --git a/libs/motor/CMakeLists.txt b/libs/motor/CMakeLists.txt index ea6fde4dfc..f7ad737150 100644 --- a/libs/motor/CMakeLists.txt +++ b/libs/motor/CMakeLists.txt @@ -16,7 +16,6 @@ target_include_directories(motor find_package(magic_enum CONFIG REQUIRED) find_package(fmt CONFIG REQUIRED) -find_package(gsl-lite CONFIG REQUIRED) # todo remove, mp-units should take care of this find_package(mp-units CONFIG REQUIRED) target_link_libraries(motor diff --git a/libs/stx/CMakeLists.txt b/libs/stx/CMakeLists.txt index 9245829ec8..28d2ed7c58 100644 --- a/libs/stx/CMakeLists.txt +++ b/libs/stx/CMakeLists.txt @@ -9,7 +9,6 @@ target_include_directories(stx $ ) -find_package(gsl-lite CONFIG REQUIRED) # todo remove, mp-units should take care of this find_package(mp-units CONFIG REQUIRED) find_package(glaze CONFIG REQUIRED) find_package(stduuid CONFIG REQUIRED) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 7423a77bbd..5bf4d929cb 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -2,7 +2,7 @@ "default-registry": { "kind": "git", "repository": "https://github.com/jbbjarnason/vcpkg", - "baseline": "bbbe0ed75e9d7f71df0926611db57e3983934261" + "baseline": "af4022b2a83149c292dd74b9b3ebc8c0f90ee595" }, "registries": [ {