Fixes to AppVeyor and Travis scripts

pull/180/head
Cedric Nugteren 2017-07-30 18:34:39 +02:00
parent e6f938e0e9
commit 6ceb9b7152
3 changed files with 10 additions and 8 deletions

View File

@ -3,7 +3,6 @@ environment:
CLBLAST_BUILD: "C:\\clblast\\build"
OPENCL_REGISTRY: "https://www.khronos.org/registry/cl"
OPENCL_ROOT: "C:\\dependencies\\opencl"
CLBLAST_VERSION: "1.0.0"
platform:
- x64
@ -59,8 +58,8 @@ build_script:
after_build:
- ps: pushd $env:CLBLAST_BUILD
- 7z a CLBlast-$env:CLBLAST_BUILD-Windows-x64.zip .\install_dir\*
- ps: mv CLBlast-$env:CLBLAST_BUILD-Windows-x64.zip $env:APPVEYOR_BUILD_FOLDER
- 7z a CLBlast-1.0.0-Windows-x64.zip .\install_dir\*
- ps: mv CLBlast-1.0.0-Windows-x64.zip $env:APPVEYOR_BUILD_FOLDER
artifacts:
- path: '*.zip'

View File

@ -43,9 +43,10 @@ script:
after_success:
- pushd ${TRAVIS_BUILD_DIR}/bin
- rm ${CLBLAST_INSTALL}/clblast_client_*
- rm ${CLBLAST_INSTALL}/clblast_test_*
- tar -cvf ${CLBLAST_TAR} ${CLBLAST_INSTALL}
- rm ${CLBLAST_INSTALL}/bin/clblast_client_*
- rm ${CLBLAST_INSTALL}/bin/clblast_test_*
- tar -cvf ${CLBLAST_TAR} CLBlast-${CLBLAST_VERSION}
- cp ${CLBLAST_TAR} ${TRAVIS_BUILD_DIR}
branches:
only:

View File

@ -101,8 +101,10 @@ else()
set(FLAGS "${FLAGS} -Wno-missing-prototypes -Wno-float-equal -Wno-switch-enum -Wno-switch")
set(FLAGS "${FLAGS} -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-noreturn")
set(FLAGS "${FLAGS} -Wno-deprecated-declarations")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9.0)
set(FLAGS "${FLAGS} -Wno-undefined-var-template")
if(NOT CMAKE_CXX_COMPILER_ID MATCHES AppleClang)
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9.0)
set(FLAGS "${FLAGS} -Wno-undefined-var-template")
endif()
endif()
endif()
endif()