diff --git a/.travis.yml b/.travis.yml index c293742..79e11f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,12 @@ matrix: env: TOOLCHAIN=NATIVE 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 compiler: gcc env: diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh index 322cf4c..8cd7fd8 100755 --- a/scripts/run_integration.sh +++ b/scripts/run_integration.sh @@ -88,7 +88,7 @@ function integrate() { esac # 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 cmake --build "${BUILD_DIR}" ${CMAKE_BUILD_ARGS}