[shark] 43/79: Update appveyor.yml

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Nov 26 15:40:44 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository shark.

commit 4a356baf54aa2558a00f970dccb28ad651b00d67
Author: Christian Igel <igel at diku.dk>
Date:   Fri Oct 30 09:53:16 2015 +0100

    Update appveyor.yml
    
    set boost lib path for both 32 and 64
---
 appveyor.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3f787a4..3180c4a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,6 @@ configuration: Debug
 # set environment variables
 environment:
   BOOST_ROOT: C:\Libraries\boost
-  BOOST_LIBRARYDIR: C:\Libraries\boost\lib64-msvc-12.0
   #OMP_NUM_THREADS: 2
 
 # specify branch
@@ -21,7 +20,7 @@ branches:
 init:
   - cmd: cmake --version
   - cmd: msbuild /version
-  - cmd: dir %BOOST_LIBRARYDIR%
+  #- cmd: dir %BOOST_LIBRARYDIR%
   
 
 # clone directory
@@ -30,11 +29,14 @@ clone_folder: C:\projects\shark
 # scripts to run before build
 before_build:
   - cmd: cd C:\projects\shark
-  - cmd: dir 
+  #- cmd: dir 
   - cmd: md build
   - cmd: cd build
   - cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR_NAME=Visual Studio 12
   - cmd: if "%platform%"=="x64"   set CMAKE_GENERATOR_NAME=Visual Studio 12 Win64
+  - cmd: if "%platform%"=="Win32" set BOOST_LIBRARYDIR=%BOOST_ROOT%\lib32-msvc-12.0
+  - cmd: if "%platform%"=="x64"   set BOOST_LIBRARYDIR=%BOOST_ROOT%\lib64-msvc-12.0
+
   - cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration%  -DBUILD_EXAMPLES=OFF -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%"   ..
   #- cmd: type C:\projects\shark\build\shark.sln 
   

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git



More information about the debian-science-commits mailing list