Skip to content

Commit

Permalink
Link Eigen3 as public library
Browse files Browse the repository at this point in the history
  • Loading branch information
GiulioRomualdi committed May 14, 2020
1 parent 0a4326d commit 68f0ce5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ add_library(${LIBRARY_TARGET_NAME} ${${LIBRARY_TARGET_NAME}_SRC} ${${LIBRARY_TAR
target_include_directories(${LIBRARY_TARGET_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")

target_link_libraries(${LIBRARY_TARGET_NAME} PRIVATE Eigen3::Eigen)
target_link_libraries(${LIBRARY_TARGET_NAME} PUBLIC osqp::osqp)
target_link_libraries(${LIBRARY_TARGET_NAME} PUBLIC osqp::osqp Eigen3::Eigen)

add_library(OsqpEigen::OsqpEigen ALIAS OsqpEigen)

Expand All @@ -108,7 +107,7 @@ target_compile_features(${LIBRARY_TARGET_NAME} PUBLIC cxx_std_14)

# List exported CMake package dependencies
set(OSQP_EIGEN_EXPORTED_DEPENDENCIES "")
list(APPEND OSQP_EIGEN_EXPORTED_DEPENDENCIES osqp)
list(APPEND OSQP_EIGEN_EXPORTED_DEPENDENCIES osqp Eigen)

install(TARGETS ${LIBRARY_TARGET_NAME}
EXPORT ${PROJECT_NAME}
Expand Down
10 changes: 5 additions & 5 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
add_osqpeigen_test(
NAME SparseMatrix
SOURCES SparseMatrixTest.cpp
LINKS OsqpEigen::OsqpEigen Eigen3::Eigen)
LINKS OsqpEigen::OsqpEigen)

add_osqpeigen_test(
NAME QP
SOURCES QPTest.cpp
LINKS OsqpEigen::OsqpEigen Eigen3::Eigen)
LINKS OsqpEigen::OsqpEigen)

add_osqpeigen_test(
NAME UpdateMatrices
SOURCES UpdateMatricesTest.cpp
LINKS OsqpEigen::OsqpEigen Eigen3::Eigen)
LINKS OsqpEigen::OsqpEigen)

add_osqpeigen_test(
NAME MPC
SOURCES MPCTest.cpp
LINKS OsqpEigen::OsqpEigen Eigen3::Eigen
LINKS OsqpEigen::OsqpEigen
COMPILE_DEFINITIONS _USE_MATH_DEFINES)

add_osqpeigen_test(
NAME MPCUpdateMatrices
SOURCES MPCUpdateMatricesTest.cpp
LINKS OsqpEigen::OsqpEigen Eigen3::Eigen
LINKS OsqpEigen::OsqpEigen
COMPILE_DEFINITIONS _USE_MATH_DEFINES)

0 comments on commit 68f0ce5

Please sign in to comment.