diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-03-03 18:46:31 +0200 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-03-03 18:46:31 +0200 |
| commit | f9a662f7ad84bb69d9685ee98728d55c9b84f86c (patch) | |
| tree | 56dab35bdc74333964dc8a76e1edef49a6f6d72e /cmake | |
| parent | Specify release config for windows (diff) | |
| download | nheko-f9a662f7ad84bb69d9685ee98728d55c9b84f86c.tar.xz | |
Specify install directory & arch for the matrix_structs library
[ci skip]
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/MatrixStructs.cmake | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake index 79a54350..73608981 100644 --- a/cmake/MatrixStructs.cmake +++ b/cmake/MatrixStructs.cmake @@ -8,20 +8,28 @@ set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs) set(MATRIX_STRUCTS_INCLUDE_DIRS ${MATRIX_STRUCTS_ROOT}/deps) +set(MATRIX_STRUCTS_LIBRARY + ${MATRIX_STRUCTS_ROOT}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}matrix_structs${CMAKE_STATIC_LIBRARY_SUFFIX}) + +include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/deps) +include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/include) +link_directories(${MATRIX_STRUCTS_ROOT}/lib) ExternalProject_Add( MatrixStructs GIT_REPOSITORY https://github.com/mujx/matrix-structs - GIT_TAG 83be1388e632a43f0570857cb79313c09fb3da0b + GIT_TAG a1beea3b115f037e26c15f22ed911341b3893411 BUILD_IN_SOURCE 1 SOURCE_DIR ${MATRIX_STRUCTS_ROOT} - CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} + CONFIGURE_COMMAND ${CMAKE_COMMAND} + -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} + -DCMAKE_INSTALL_PREFIX=${MATRIX_STRUCTS_ROOT} + -Ax64 BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release - INSTALL_COMMAND "" + INSTALL_COMMAND ${CMAKE_COMMAND} + --build ${MATRIX_STRUCTS_ROOT} + --config Release + --target install ) - -include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/deps) -include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/include) -link_directories(${MATRIX_STRUCTS_ROOT}) |