From cea364a8817eb29e64e707572d29230d2bf2c83b Mon Sep 17 00:00:00 2001 From: Snaipe Date: Mon, 18 Jan 2016 17:23:31 +0100 Subject: [PATCH] [appveyor] Trying to fix autotools on mingw --- CMakeLists.txt | 4 ++-- appveyor.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2d346a..71b3a9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,13 +31,13 @@ cr_add_subproject (nanomsg PATH dependencies/nanomsg-patched OPTS "-DNN_TESTS=OFF" CMAKE - IF MSVC + IF WIN32 AND NOT CYGWIN ) cr_add_subproject (nanomsg PATH dependencies/nanomsg-patched AUTOTOOLS PARALLELIZE - IF NOT MSVC + IF NOT WIN32 OR CYGWIN ) cr_add_subproject (wingetopt PATH dependencies/wingetopt CMAKE IF MSVC) diff --git a/appveyor.yml b/appveyor.yml index 8447abd..2f92a0c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,6 @@ os: Visual Studio 2015 init: - git config --global core.autocrlf input - 'SET PATH=C:\MinGW\bin;%PATH%;C:\MinGW\msys\1.0\bin;%APPVEYOR_BUILD_FOLDER%\build;%APPVEYOR_BUILD_FOLDER%\build\Debug;%APPVEYOR_BUILD_FOLDER%\build\external\bin;%APPVEYOR_BUILD_FOLDER%\build\external\lib' - - mingw-get install libtool environment: COVERALLS_REPO_TOKEN: