johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-27 23:22:31 +02:00
Code Issues Releases Wiki Activity

Allow specifying cmake generator.

Browse Source
This commit is contained in:
Guillaume Chatelet 2019-01-17 14:03:37 +01:00
parent fc7efb4c14
commit 317edf860b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -32,6 +32,12 @@ matrix:
env: env:
TOOLCHAIN=NATIVE TOOLCHAIN=NATIVE
TARGET=x86_64-windows TARGET=x86_64-windows
CMAKE_GENERATOR="Visual Studio 14 2015 Win64"
- os: windows
env:
TOOLCHAIN=NATIVE
TARGET=x86_64-windows
CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
- os: linux-ppc64le - os: linux-ppc64le
compiler: gcc compiler: gcc
env: env:

2
scripts/run_integration.sh
View File

@ -88,7 +88,7 @@ function integrate() {
esac esac
# Generating CMake configuration # Generating CMake configuration
cmake -H. -B"${BUILD_DIR}" ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS} cmake -H. -B"${BUILD_DIR}" ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS} -G"${CMAKE_GENERATOR:-Unix Makefiles}"
# Building # Building
cmake --build "${BUILD_DIR}" ${CMAKE_BUILD_ARGS} cmake --build "${BUILD_DIR}" ${CMAKE_BUILD_ARGS}