From 5b5aef88ffae40e6ef900612cf6503e5f87394e4 Mon Sep 17 00:00:00 2001
From: Jacob Alexander <haata@kiibohd.com>
Date: Mon, 10 Oct 2016 22:31:53 -0700
Subject: [PATCH] Updating travis.yml script

- Excluding Cygwin and Win32 from Python check
  * Tends to fail miserably...
- Added more appveyor build info
---
 .travis.yml         | 2 +-
 Lib/CMake/kll.cmake | 2 +-
 appveyor.yml        | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5259a59..99d1999 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,7 +76,7 @@ matrix:
 # Package Setup
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install git python3 ctags dfu-util tree; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3 ctags dfu-util tree; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]];   then brew tap Caskroom/cask; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]];   then brew install Caskroom/cask/gcc-arm-embedded; fi
   # This may work, but we'd have to compile llvm...
diff --git a/Lib/CMake/kll.cmake b/Lib/CMake/kll.cmake
index 534761b..84e7f80 100644
--- a/Lib/CMake/kll.cmake
+++ b/Lib/CMake/kll.cmake
@@ -19,7 +19,7 @@ if ( "${MacroModule}" STREQUAL "PartialMap" )
 # Check disabled for Win32 as it can't detect version correctly (we don't use Python directly through CMake anyways)
 #
 
-if ( NOT WIN32 )
+if ( NOT CMAKE_HOST_WIN32 )
 	# Required on systems where python is 2, not 3
 	set ( PYTHON_EXECUTABLE
 		python3
diff --git a/appveyor.yml b/appveyor.yml
index 4e4e8b8..7e35452 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -80,7 +80,9 @@ build_script:
   - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && 7z x -o/ /cygdrive/c/gcc-arm-none-eabi.zip"'
   - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && pwd"'
   - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && tree"'
+  - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && which cmake"'
   - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && cmake --version"'
+  - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"/%SCRIPT_DIR% && export wincmake_path=\"%WIN_CMAKE%\" && export PATH=\"${wincmake_path}\":$PATH && which cmake"'
   - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"/%SCRIPT_DIR% && export wincmake_path=\"%WIN_CMAKE%\" && export PATH=\"${wincmake_path}\":$PATH && cmake --version"'
   - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && git --version"'
   - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && python3 --version"'