Skip to content

Commit

Permalink
build: don't package Eigen with the project
Browse files Browse the repository at this point in the history
  • Loading branch information
jolars committed Dec 6, 2023
1 parent 2c51010 commit 83042e3
Show file tree
Hide file tree
Showing 304 changed files with 8 additions and 116,738 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4

- name: Install dependencies
run: sudo apt-get install -y g++
run: sudo apt-get install -y build-essential libeigen3-dev

- name: Setup cmake
uses: jwlawson/[email protected]
Expand Down Expand Up @@ -44,12 +44,7 @@ jobs:
uses: actions/checkout@v4

- name: Install dependencies
run: sudo apt-get install -y g++ doxygen

- uses: actions/setup-python@v4

- name: Install python dependencies
run: python -m pip install sphinx sphinx-rtd-theme sphinx-sitemap breathe
run: sudo apt-get install -y build-essential doxygen libeigen3-dev

- name: Setup cmake
uses: jwlawson/[email protected]
Expand Down
24 changes: 6 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(PROJECT_SRC_DIR ${CMAKE_SOURCE_DIR}/src)
set(PROJECT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/src)

include_directories(${CMAKE_SOURCE_DIR}/external)
find_package(Eigen3 3.3 REQUIRED NO_MODULE)

add_subdirectory(src)

Expand All @@ -37,7 +37,8 @@ if(BUILD_TESTING)
add_executable(
tests tests/gaussian.cpp tests/prox.cpp tests/qnorm.cpp
tests/lambda_sequence.cpp tests/path.cpp tests/standardize.cpp)
target_link_libraries(tests PRIVATE slope Catch2::Catch2WithMain)
target_link_libraries(tests PRIVATE slope Catch2::Catch2WithMain
Eigen3::Eigen)
target_include_directories(tests PUBLIC tests/ "${PROJECT_BINARY_DIR}")

list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
Expand All @@ -47,19 +48,6 @@ endif()

if(BUILD_DOCS)
find_package(Doxygen REQUIRED)
set(DOXYGEN_IN ${CMAKE_SOURCE_DIR}/docs/Doxyfile.in)
set(DOXYGEN_OUT ${CMAKE_SOURCE_DIR}/docs/Doxyfile)
configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
add_custom_target(
docs ALL
COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
COMMENT "Generating Doxygen XML"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docs/
VERBATIM)
add_custom_target(
docs_sphinx ALL
COMMAND make html
COMMENT "Generating sphinx HTML"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docs/
VERBATIM)
doxygen_add_docs(docs ${PROJECT_SOURCE_DIR} ALL
COMMENT "Generate package documentation")
endif()
19 changes: 0 additions & 19 deletions external/Eigen/CMakeLists.txt

This file was deleted.

46 changes: 0 additions & 46 deletions external/Eigen/Cholesky

This file was deleted.

48 changes: 0 additions & 48 deletions external/Eigen/CholmodSupport

This file was deleted.

Loading

0 comments on commit 83042e3

Please sign in to comment.