Merge d3d370c into aca1eda

flexible-collision-library · Aug 13, 2016 · f81d0ae · f81d0ae
2 parents aca1eda + d3d370c
commit f81d0ae
Showing 1 changed file with 9 additions and 7 deletions.
diff --git 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
@@ -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