diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-03-03 19:57:00 +0200 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-03-03 19:57:00 +0200 |
| commit | 564d51943e21978732774341710637df43e408c9 (patch) | |
| tree | c8be5171cb0c4b6c7b5457850bfd80b03bb56bd0 /cmake | |
| parent | Specify install directory & arch for the matrix_structs library (diff) | |
| download | nheko-564d51943e21978732774341710637df43e408c9.tar.xz | |
Pass arch flags for appveyor build
[ci skip]
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/MatrixStructs.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake index 73608981..42071b61 100644 --- a/cmake/MatrixStructs.cmake +++ b/cmake/MatrixStructs.cmake @@ -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_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) +set(WINDOWS_FLAGS "") + +if(MSVC) + set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") +endif() + ExternalProject_Add( MatrixStructs @@ -26,7 +30,7 @@ ExternalProject_Add( CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} -DCMAKE_INSTALL_PREFIX=${MATRIX_STRUCTS_ROOT} - -Ax64 + ${WINDOWS_FLAGS} BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release INSTALL_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} |