Skip to content

N
ngraph
Commit 1473058f authored by Nick Korovaiko's avatar Nick Korovaiko Committed by GitHub
Browse files
Options

Merge branch 'master' into krovatkin/cleanup

parents 10be57e7 5b324aee
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 6 deletions
.gitignore
View file @ 1473058f
...@@ -69,3 +69,7 @@ config_args.txt ...@@ -69,3 +69,7 @@ config_args.txt
.nfs* .nfs*
venv/ venv/
.vscode/ .vscode/
# VisualGDB files
VisualGDB/
toolchain.cmake
cmake/external_eigen.cmake
View file @ 1473058f
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
include(ExternalProject) include(ExternalProject)
set(EIGEN_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/eigen) set(EIGEN_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/eigen)
set(EIGEN_PROJECT eigen)
set(EIGEN_SHA1_HASH dd238ca6c6b5d2ce2e7e2e9ded4c59bad77ce6d0)
set(EIGEN_URL http://bitbucket.org/eigen/eigen/get/3.3.3.zip)
#---------------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------------
# Download and install GoogleTest ... # Download and install GoogleTest ...
...@@ -23,17 +26,17 @@ set(EIGEN_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/eigen) ...@@ -23,17 +26,17 @@ set(EIGEN_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/eigen)
# The 'BUILD_BYPRODUCTS' argument was introduced in CMake 3.2. # The 'BUILD_BYPRODUCTS' argument was introduced in CMake 3.2.
if (${CMAKE_VERSION} VERSION_LESS 3.2) if (${CMAKE_VERSION} VERSION_LESS 3.2)
ExternalProject_Add( ExternalProject_Add(
eigen ${EIGEN_PROJECT}
URL http://bitbucket.org/eigen/eigen/get/3.3.3.zip URL ${EIGEN_URL}
# PREFIX ${CMAKE_CURRENT_BINARY_DIR}/eigen URL_HASH SHA1=${EIGEN_SHA1_HASH}
UPDATE_COMMAND "" UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EIGEN_INSTALL_DIR} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EIGEN_INSTALL_DIR}
) )
else() else()
ExternalProject_Add( ExternalProject_Add(
eigen ${EIGEN_PROJECT}
URL http://bitbucket.org/eigen/eigen/get/3.3.3.zip URL ${EIGEN_URL}
# PREFIX ${CMAKE_CURRENT_BINARY_DIR}/eigen URL_HASH SHA1=${EIGEN_SHA1_HASH}
UPDATE_COMMAND "" UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EIGEN_INSTALL_DIR} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EIGEN_INSTALL_DIR}
BUILD_BYPRODUCTS "${EIGEN_INSTALL_DIR}/include/eigen3" BUILD_BYPRODUCTS "${EIGEN_INSTALL_DIR}/include/eigen3"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment