rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass arch flags for appveyor build

Browse Source 
[ci skip]
This commit is contained in:
Konstantinos Sideris 2018-03-03 19:57:00 +02:00
parent f9a662f7ad
commit 564d51943e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -215,13 +215,13 @@ set(SRC_FILES
# #
# matrix-structs # matrix-structs
# #
include(${CMAKE_SOURCE_DIR}/cmake/MatrixStructs.cmake) include(MatrixStructs)
include_directories(${MATRIX_STRUCTS_INCLUDE_DIRS}) include_directories(${MATRIX_STRUCTS_INCLUDE_DIRS})
# #
# lmdbxx # lmdbxx
# #
include(${CMAKE_SOURCE_DIR}/cmake/LMDBXX.cmake) include(LMDBXX)
include_directories(${LMDBXX_INCLUDE_DIRS}) include_directories(${LMDBXX_INCLUDE_DIRS})
include_directories(include) include_directories(include)
@ -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_LIBRARY} Qt5::Widgets Qt5::Network Qt5::Concurrent) set(COMMON_LIBS matrix_structs Qt5::Widgets Qt5::Network Qt5::Concurrent)
if(APPVEYOR_BUILD) if(APPVEYOR_BUILD)
set(NHEKO_LIBS ${COMMON_LIBS} lmdb) set(NHEKO_LIBS ${COMMON_LIBS} lmdb)

10
cmake/MatrixStructs.cmake
View File

@ -8,13 +8,17 @@ 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}/deps)
include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/include) include_directories(SYSTEM ${MATRIX_STRUCTS_ROOT}/include)
link_directories(${MATRIX_STRUCTS_ROOT}/lib) link_directories(${MATRIX_STRUCTS_ROOT}/lib)
set(WINDOWS_FLAGS "")
if(MSVC)
set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64")
endif()
ExternalProject_Add( ExternalProject_Add(
MatrixStructs MatrixStructs
@ -26,7 +30,7 @@ ExternalProject_Add(
CONFIGURE_COMMAND ${CMAKE_COMMAND} CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT}
-DCMAKE_INSTALL_PREFIX=${MATRIX_STRUCTS_ROOT} -DCMAKE_INSTALL_PREFIX=${MATRIX_STRUCTS_ROOT}
-Ax64 ${WINDOWS_FLAGS}
BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release
INSTALL_COMMAND ${CMAKE_COMMAND} INSTALL_COMMAND ${CMAKE_COMMAND}
--build ${MATRIX_STRUCTS_ROOT} --build ${MATRIX_STRUCTS_ROOT}