From 4d0571fd73bb439ad13dbee019cb5ad77f9ec358 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Tue, 22 Jul 2014 17:17:22 +0200 Subject: [PATCH] Fix win32 linking and run test automatically in AppVayor --- CMakeLists.txt | 2 ++ appveyor.yml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index db254b702..154edaeac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release) endif (HAS_LTO_FLAG) endif() +if (NOT WIN32) add_definitions(-DBOOST_TEST_DYN_LINK) +endif() # Configuring compilers if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") diff --git a/appveyor.yml b/appveyor.yml index a73873d09..6635c5117 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,9 @@ build_script: - nmake tests - nmake benchmarks - if "%APPVEYOR_REPO_BRANCH%"=="develop" (7z a %P%/osrm_%Configuration%.zip *.exe *.pdb %P%/libs/bin/*.dll -tzip) + - set PATH=%PATH%;c:/projects/osrm/libs/bin + - cd c:/projects/osrm/build + - datastructure-tests.exe test: off