d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Specify install directory & arch for the matrix_structs library

Browse source 
[ci skip]
This commit is contained in:
Konstantinos Sideris 2018-03-03 18:46:31 +02:00
parent b00365f665
commit f9a662f7ad
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -321,7 +321,7 @@ endif()
qt5_add_resources(LANG_QRC ${_qrc}) qt5_add_resources(LANG_QRC ${_qrc})
qt5_add_resources(QRC resources/res.qrc) qt5_add_resources(QRC resources/res.qrc)
set(COMMON_LIBS matrix_structs Qt5::Widgets Qt5::Network Qt5::Concurrent) set(COMMON_LIBS ${MATRIX_STRUCTS_LIBRARY} Qt5::Widgets Qt5::Network Qt5::Concurrent)
if(APPVEYOR_BUILD) if(APPVEYOR_BUILD)
set(NHEKO_LIBS ${COMMON_LIBS} lmdb) set(NHEKO_LIBS ${COMMON_LIBS} lmdb)

22
cmake/MatrixStructs.cmake
View file

@ -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_ROOT ${THIRD_PARTY_ROOT}/matrix_structs)
set(MATRIX_STRUCTS_INCLUDE_DIRS ${MATRIX_STRUCTS_ROOT}/deps) 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( ExternalProject_Add(
MatrixStructs MatrixStructs
GIT_REPOSITORY https://github.com/mujx/matrix-structs GIT_REPOSITORY https://github.com/mujx/matrix-structs
GIT_TAG 83be1388e632a43f0570857cb79313c09fb3da0b GIT_TAG a1beea3b115f037e26c15f22ed911341b3893411
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
SOURCE_DIR ${MATRIX_STRUCTS_ROOT} 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 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})