From 75cca21752a9cd47e888cea6c6b7c69dc0fc5b04 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 12 Aug 2016 22:50:48 -0400 Subject: [PATCH 1/2] Enable Win32 build test on Appveyor --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a0a084ba7..ad331af19 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,10 +7,10 @@ os: Visual Studio 2015 clone_folder: C:\projects\fcl shallow_clone: true -# branches: -# only: -# - master -platform: x64 +# build platform, i.e. Win32 (instead of x86), x64, Any CPU. This setting is optional. +platform: + - Win32 + - x64 environment: CTEST_OUTPUT_ON_FAILURE: 1 From d3d370c6e689ffd7dd214876c2f9cb21b05ae95d Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 12 Aug 2016 22:55:12 -0400 Subject: [PATCH 2/2] Fix CMake generator to be aware of platform (Win32|x64) --- .appveyor.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ad331af19..ffd0dfa8f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,11 +23,13 @@ configuration: - Release before_build: + - cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 + - cmd: if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64 - cmd: if not exist C:\"Program Files"\libccd\lib\ccd.lib ( curl -L -o libccd-2.0.tar.gz https://github.com/danfis/libccd/archive/v2.0.tar.gz && cmake -E tar zxf libccd-2.0.tar.gz && cd libccd-2.0 && - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%Configuration% . && + cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%Configuration% . && cmake --build . --target install --config %Configuration% && cd .. ) else (echo Using cached libccd) @@ -37,14 +39,14 @@ before_build: cd eigen-eigen-dc6cfdf9bcec && mkdir build && cd build && - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%Configuration% .. && + cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%Configuration% .. && cmake --build . --target install --config %Configuration% && cd ..\.. ) else (echo Using cached Eigen3) - cmd: set - cmd: mkdir build - cmd: cd build - - cmd: cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%Configuration% -DCCD_INCLUDE_DIRS="C:\Program Files\libccd\include" -DCCD_LIBRARY="C:\Program Files\libccd\lib\ccd.lib" -DEIGEN3_INCLUDE_DIR="C:\Program Files\Eigen\include\eigen3" .. + - cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%Configuration% -DCCD_INCLUDE_DIRS="C:\Program Files\libccd\include" -DCCD_LIBRARY="C:\Program Files\libccd\lib\ccd.lib" -DEIGEN3_INCLUDE_DIR="C:\Program Files\Eigen\include\eigen3" .. build: project: C:\projects\fcl\build\fcl.sln