Skip to content

Commit

Permalink
COMP: re-fix Eigen build issue
Browse files Browse the repository at this point in the history
fixes #94: Eigen is header-only, so there is no library to depend on.
  • Loading branch information
ihnorton committed Dec 18, 2017
1 parent a670dfd commit d810f4e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
30 changes: 15 additions & 15 deletions UKFTractography.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ endif()
if(DEFINED Eigen_INCLUDE_DIR)
include_directories(${Eigen_INCLUDE_DIR})
else()
if(DEFINED Eigen_DIR)
if(DEFINED Eigen_DIR)
set(Eigen_INCLUDE_DIR
${Eigen_DIR}/../Eigen)
include_directories(${Eigen_INCLUDE_DIR})
else()
set (Eigen_DIR ${CMAKE_CURRENT_BINARY_DIR}/Eigen)
set (Eigen_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/Eigen-build)
ExternalProject_Add(
Eigen
DOWNLOAD_DIR ${Eigen_DIR}
SOURCE_DIR ${Eigen_DIR}
BINARY_DIR ${Eigen_BUILD_DIR}
GIT_REPOSITORY ${Eigen_GIT_REPOSITORY}
GIT_TAG ${Eigen_GIT_TAG}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
include_directories(${Eigen_DIR})
set (Eigen_DIR ${CMAKE_CURRENT_BINARY_DIR}/Eigen)
set (Eigen_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/Eigen-build)
ExternalProject_Add(
Eigen
DOWNLOAD_DIR ${Eigen_DIR}
SOURCE_DIR ${Eigen_DIR}
BINARY_DIR ${Eigen_BUILD_DIR}
GIT_REPOSITORY ${Eigen_GIT_REPOSITORY}
GIT_TAG ${Eigen_GIT_TAG}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
include_directories(${Eigen_DIR})
endif()
endif()

Expand Down
3 changes: 0 additions & 3 deletions ukf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,5 @@ SEMMacroBuildCLI(
EXECUTABLE_ONLY
)

#-----------------------------------------------------------------------------
add_dependencies(${MODULE_NAME}Lib Eigen)

#-----------------------------------------------------------------------------
add_subdirectory(Testing)

0 comments on commit d810f4e

Please sign in to comment.