diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31a265dfaf..b19547347e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)")
 endif()
 
 if (USE_VCPKG_EIGEN)
-set (EIGEN_VCPKG_REPLACE "find_package(eigen3 CONFIG)")
+set (EIGEN_VCPKG_REPLACE "find_package(Eigen3 CONFIG)")
 endif()
 
 if (MSVC OR FLAT_INSTALL_WPILIB)
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
index 0443b12fa6..7acc6c52a9 100644
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-if (NOT MSVC)
+if (NOT MSVC AND NOT APPLE)
     find_library(ATOMIC NAMES atomic libatomic.so.1)
     if (ATOMIC)
         message(STATUS "Found libatomic: ${ATOMIC}")
@@ -129,8 +129,8 @@ if (NOT USE_VCPKG_EIGEN)
                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/eigen>
                             $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
 else()
-    find_package(eigen3 CONFIG REQUIRED)
-    target_include_directories (wpiutil PUBLIC ${EIGEN3_INCLUDE_DIRS})
+    find_package(Eigen3 CONFIG REQUIRED)
+    target_link_libraries (wpiutil Eigen3::Eigen)
 endif()
 
 if (NOT USE_VCPKG_LIBUV)