Skip to content

Commit

Permalink
Update appveyor.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
nekipelov committed Sep 20, 2016
1 parent 0767b23 commit 7eb7eda
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ FOREACH(TEST ${TESTS})
TARGET_LINK_LIBRARIES(${TEST} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
ENDFOREACH()


INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src DESTINATION include)

ADD_SUBDIRECTORY(examples)
Expand Down
51 changes: 25 additions & 26 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: {build}-{branch}
version: "{build}-{branch}"

# branches to build
branches:
Expand All @@ -20,8 +20,8 @@ configuration:
environment:
MSVC_DEFAULT_OPTIONS: ON
BOOST_ROOT: C:\Libraries\boost_1_59_0
BOOST_LIBRARY_DIR_WIN32: C:\Libraries\boost_1_59_0\lib32-msvc-14.0
BOOST_LIBRARY_DIR_WIN64: C:\Libraries\boost_1_59_0\lib64-msvc-14.0
BOOST_LIBRARYDIR_WIN32: C:\Libraries\boost_1_59_0\lib32-msvc-14.0
BOOST_LIBRARYDIR_WIN64: C:\Libraries\boost_1_59_0\lib64-msvc-14.0

init:
- cmd: cmake --version
Expand All @@ -30,30 +30,29 @@ init:
clone_folder: C:\projects\redisclient

build_script:
- cd C:\projects\redisclient
- md build
- cd build
- if "%platform%"=="Win32" (
- set CMAKE_GENERATOR_NAME=Visual Studio 14 2015
- set BOOST_LIBRARY_DIR=%BOOST_LIBRARY_DIR_WIN32%
- )
- if "%platform%"=="X64" (
- set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64
- set BOOST_LIBRARY_DIR=%BOOST_LIBRARY_DIR_WIN64%
- )
- cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBoost_USE_STATIC_LIBS="ON" -Durdfdom_DIR="%urdfdom_DIR%" -Durdfdom_headers_DIR="%urdfdom_headers_DIR%" -DDART_MSVC_DEFAULT_OPTIONS="%MSVC_DEFAULT_OPTIONS%" ..

build:
project: c:/projects/redisclient/build/RedisClient.sln
- cmd: cd C:\projects\redisclient
- cmd: md build
- cmd: cd build
- ps: |
If ($env:platform -Match "Win32") {
$env:CMAKE_GENERATOR_NAME="Visual Studio 14 2015"
$env:BOOST_LIBRARYDIR=$env:BOOST_LIBRARYDIR_WIN32
}
- ps: |
If ($env:platform -Match "X64") {
$env:CMAKE_GENERATOR_NAME="Visual Studio 14 2015 Win64"
$env:BOOST_LIBRARYDIR=$env:BOOST_LIBRARYDIR_WIN64
}
- cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBoost_USE_STATIC_LIBS="ON" ..
- cmd: cmake --build . -- /verbosity:detailed
- cmd: dir debug\
- cmd: debug\parsertest.exe

#build:
# parallel: true
# verbosity: detailed
# project: c:/projects/redisclient/build/RedisClient.sln

test_script:
- cmd: ctest -C %configuration% -VV

after_build:
before_test:
test_script:
after_test:
on_success:
on_failure:
on_finish:

0 comments on commit 7eb7eda

Please sign in to comment.