diff options
author | Silvio Traversaro <pegua1@gmail.com> | 2017-04-09 17:51:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-09 17:51:35 +0200 |
commit | 18195b170b636b10d30b4073f7bdecf6a331fc9d (patch) | |
tree | f44c8140cce884cdc59b95e09c70b9176df6bc49 | |
parent | 69bd6d5ce440ce1c7c897fb03be0339a76c2d972 (diff) | |
parent | 8e853e00735651519681e3f37b583bdcb4c6df0b (diff) | |
download | dlfcn-win32-18195b170b636b10d30b4073f7bdecf6a331fc9d.tar.gz dlfcn-win32-18195b170b636b10d30b4073f7bdecf6a331fc9d.tar.bz2 dlfcn-win32-18195b170b636b10d30b4073f7bdecf6a331fc9d.zip |
Merge pull request #30 from Kamekameha/appveyor-fix
Minor AppVeyor configuration cleanup
-rw-r--r-- | .appveyor.yml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index d97a44e..79182a7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml | |||
@@ -1,4 +1,4 @@ | |||
1 | # Copyright (c) 2014, Ruslan Baratov | 1 | # Copyright (c) 2014 Ruslan Baratov |
2 | # Copyright (c) 2014, 2016 Alexander Lamaison | 2 | # Copyright (c) 2014, 2016 Alexander Lamaison |
3 | # Copyright (c) 2017 Silvio Traversaro | 3 | # Copyright (c) 2017 Silvio Traversaro |
4 | # All rights reserved. | 4 | # All rights reserved. |
@@ -24,7 +24,7 @@ | |||
24 | # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 24 | # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
25 | # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | 26 | ||
27 | os: Visual Studio 2015 | 27 | image: Visual Studio 2015 |
28 | 28 | ||
29 | environment: | 29 | environment: |
30 | matrix: | 30 | matrix: |
@@ -41,34 +41,34 @@ environment: | |||
41 | BUILD_SHARED_LIBS: OFF | 41 | BUILD_SHARED_LIBS: OFF |
42 | 42 | ||
43 | platform: | 43 | platform: |
44 | - x86 | 44 | - Win32 |
45 | - x64 | 45 | - x64 |
46 | 46 | ||
47 | configuration: | 47 | configuration: |
48 | - Debug | 48 | - Debug |
49 | - Release | 49 | - Release |
50 | 50 | ||
51 | build_script: | 51 | before_build: |
52 | - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" } | ||
53 | - md build | 52 | - md build |
54 | - cd build | 53 | - cd build |
55 | - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX="./install" .. | 54 | - cmake -G "%GENERATOR%" -A "%PLATFORM%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=install .. |
56 | - cmake --build . --config "%CONFIGURATION%" | 55 | |
56 | build: | ||
57 | project: build/dlfcn-win32.sln | ||
57 | 58 | ||
58 | test_script: | 59 | test_script: |
59 | - ctest --output-on-failure --build-config "%CONFIGURATION%" | 60 | - ctest --output-on-failure --build-config "%CONFIGURATION%" |
60 | 61 | ||
61 | after_test: | 62 | after_test: |
62 | - cmake --build . --config "%CONFIGURATION%" --target INSTALL | 63 | - cmake --build . --config "%CONFIGURATION%" --target INSTALL |
63 | # Test also the use of dlfcn-win32 from an external CMake project | 64 | # Test also the use of dlfcn-win32 from an external CMake project |
64 | # Append the instllation directory of dlfcn-win32 to CMAKE_PREFIX_PATH to make sure that the CMake project is found | 65 | # Append the instllation directory of dlfcn-win32 to CMAKE_PREFIX_PATH to make sure that the CMake project is found |
65 | - set CMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/build/install | 66 | - set CMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/build/install |
66 | # Append the bin installation directory of dlfcn-win32 to the path to make sure that .dll are found | 67 | # Append the bin installation directory of dlfcn-win32 to the path to make sure that .dll are found |
67 | - set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%/build/install/bin | 68 | - set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%/build/install/bin |
68 | - cd ../cmake-test | 69 | - cd ../cmake-test |
69 | - md build | 70 | - md build |
70 | - cd build | 71 | - cd build |
71 | - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_TESTS=ON .. | 72 | - cmake -G "%GENERATOR%" -A "%PLATFORM%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_TESTS=ON .. |
72 | - cmake --build . --config "%CONFIGURATION%" | 73 | - cmake --build . --config "%CONFIGURATION%" |
73 | - ctest --output-on-failure --build-config "%CONFIGURATION%" | 74 | - ctest --output-on-failure --build-config "%CONFIGURATION%" |
74 | |||