Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix eigen build in vcpkg (#1856)

Browse Source
This commit is contained in:
Thad House
2019-08-27 14:38:23 -07:00
committed by Peter Johnson
parent 2bdb443255
commit d10a1a7977
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -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)

6
wpiutil/CMakeLists.txt
View File

@@ -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)