Adjust CMakeLists to make dependency downloading optional
1 files changed, 5 insertions, 11 deletions
diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake
index 9b8baba6..cef00f61 100644
--- a/cmake/MatrixStructs.cmake
+++ b/cmake/MatrixStructs.cmake
@@ -6,12 +6,10 @@ include(ExternalProject)
set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs)
+set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include)
+set(MATRIX_STRUCTS_LIBRARY matrix_structs)
-set(MATRIX_STRUCTS_INCLUDE_DIRS ${MATRIX_STRUCTS_ROOT}/deps)
-
-include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/deps)
-include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/include)
-link_directories(${MATRIX_STRUCTS_ROOT}/lib)
+link_directories(${MATRIX_STRUCTS_ROOT})
set(WINDOWS_FLAGS "")
@@ -23,17 +21,13 @@ ExternalProject_Add(
MatrixStructs
GIT_REPOSITORY https://github.com/mujx/matrix-structs
- GIT_TAG 45e2671d9e5a5de46834c834e282da006f1689a0
+ GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922
BUILD_IN_SOURCE 1
SOURCE_DIR ${MATRIX_STRUCTS_ROOT}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT}
- -DCMAKE_INSTALL_PREFIX=${MATRIX_STRUCTS_ROOT}
${WINDOWS_FLAGS}
BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release
- INSTALL_COMMAND ${CMAKE_COMMAND}
- --build ${MATRIX_STRUCTS_ROOT}
- --config Release
- --target install
+ INSTALL_COMMAND ""
)
|