From 11128f22e3e6ab856e1580b9eb5f1ebf3b632c5e Mon Sep 17 00:00:00 2001
From: Dan Macumber <dan.macumber@gmail.com>
Date: Thu, 15 Dec 2016 10:07:51 -0700
Subject: [PATCH] Update to test Windows build machines

---
 .decent_ci-Windows.yaml       |  4 ++--
 CMakeLists.txt                |  8 +-------
 openstudiocore/CMakeLists.txt | 10 ++++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.decent_ci-Windows.yaml b/.decent_ci-Windows.yaml
index 6a926c33a3a..aebcd423c4e 100644
--- a/.decent_ci-Windows.yaml
+++ b/.decent_ci-Windows.yaml
@@ -1,10 +1,10 @@
 compilers:
   - name: Visual Studio
     version: 12
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_SWIG:BOOL=ON -DBUILD_QT:BOOL=OFF -DBUILD_RUBY:BOOL=ON -DUSE_PCH:BOOL=ON -DBUILD_CSHARP_BINDINGS:BOOL=ON -DMAXIMIZE_CPU_USAGE:BOOL=ON
+    cmake_extra_flags: -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_PAT:BOOL=OFF -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_BOOST:BOOL=OFF -DBUILD_QT:BOOL=OFF -DBUILD_RUBY:BOOL=OFF -DBUILD_OPENSTUDIO_GEMS:BOOL=OFF -DUSE_PCH:BOOL=ON -DBUILD_CSHARP_BINDINGS:BOOL=ON -DMAXIMIZE_CPU_USAGE:BOOL=ON
   - name: Visual Studio
     version: 12
     architecture: Win64
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_SWIG:BOOL=ON -DBUILD_QT:BOOL=OFF -DBUILD_RUBY:BOOL=ON -DUSE_PCH:BOOL=ON -DBUILD_CSHARP_BINDINGS:BOOL=ON -DMAXIMIZE_CPU_USAGE:BOOL=ON
+    cmake_extra_flags: -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_PAT:BOOL=OFF -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_BOOST:BOOL=OFF -DBUILD_QT:BOOL=OFF -DBUILD_RUBY:BOOL=OFF -DBUILD_OPENSTUDIO_GEMS:BOOL=OFF -DUSE_PCH:BOOL=ON -DBUILD_CSHARP_BINDINGS:BOOL=ON -DMAXIMIZE_CPU_USAGE:BOOL=ON
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ea391beb7c..6797e9fddee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -507,6 +507,7 @@ ExternalProject_Add(OSCore
     -DBUILD_PYTHON_BINDINGS:BOOL=${BUILD_PYTHON_BINDINGS}
     -DBUILD_TESTING:BOOL=${BUILD_TESTING}
     -DBUILD_PACKAGE:BOOL=${BUILD_PACKAGE}
+    -DBUILD_PAT:BOOL=${BUILD_PAT}
     -DBUILD_WITH_MULTIPLE_PROCESSES:BOOL=${BUILD_WITH_MULTIPLE_PROCESSES}
     -DUSE_PCH:BOOL=${USE_PCH}
     -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -518,22 +519,15 @@ ExternalProject_Add(OSCore
     -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
     -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
     -DCMAKE_PREFIX_PATH:STRING=${CMAKE_PREFIX_PATH}
-    -DCMAKE_VERSION_MAJOR:STRING=${CMAKE_VERSION_MAJOR}
-    -DCMAKE_VERSION_MINOR:STRING=${CMAKE_VERSION_MINOR}
-    -DCMAKE_VERSION_PATCH:STRING=${CMAKE_VERSION_PATCH}
-    -DCMAKE_VERSION_BUILD:STRING=${CMAKE_VERSION_BUILD}
     -DBOOST_ROOT:STRING=${BOOST_ROOT}
     -DBOOST_LIBRARYDIR:STRING=${BOOST_LIBRARYDIR}
     -DQT_INSTALL_DIR:PATH=${QT_INSTALL_DIR}
-    -DQt5Static:BOOL=${Qt5Static}
     -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-    -DSWIG_EXECUTABLE:STRING=${SWIG_EXECUTABLE}
     -DNODE_BIN_DIR:STRING=${NODE_BIN_DIR}
     -DNODE_INCLUDE_DIR:STRING=${NODE_INCLUDE_DIR}
     -DV8_INCLUDE_DIR:STRING=${V8_INCLUDE_DIR}
     -DDOXYGEN_EXECUTABLE:STRING=${DOXYGEN_EXECUTABLE}
     -DDOXYGEN_DOT_EXECUTABLE:STRING=${DOXYGEN_DOT_EXECUTABLE}
-    -DPATCH_EXE:PATH=${PATCH_EXE}
     -DMAXIMIZE_CPU_USAGE:BOOL=${MAXIMIZE_CPU_USAGE}
     -DRUBY_INSTALL_DIR:PATH=${RUBY_INSTALL_DIR}
     INSTALL_COMMAND ""
diff --git a/openstudiocore/CMakeLists.txt b/openstudiocore/CMakeLists.txt
index 0d537f163ae..71fdfb567f9 100644
--- a/openstudiocore/CMakeLists.txt
+++ b/openstudiocore/CMakeLists.txt
@@ -46,6 +46,12 @@ else()
   set(GIT_DIR "")
 endif()
 
+find_program(PATCH_EXE patch HINTS "${GIT_DIR}" "${GIT_DIR}/../bin/" "${GIT_DIR}/../usr/bin/")
+string(COMPARE EQUAL "${PATCH_EXE}" "PATCH_EXE-NOTFOUND" PATCH_EXE_NOTFOUND)
+if(PATCH_EXE_NOTFOUND)
+  message(SEND_ERROR "Required program patch not found")
+endif()
+
 # OpenStudio version
 set(OPENSTUDIO_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(OPENSTUDIO_LONG_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_BUILD}")
@@ -191,9 +197,6 @@ if(BUILD_V8_BINDINGS)
   option(BUILD_NODE_MODULES "Build V8 Bindings as Node Modules" ON)
 endif()
 
-# Configure vagrant
-set(SHOW_VAGRANT "false" CACHE BOOL "Show vagrant option to GUI users")
-
 # Use PCH
 option(USE_PCH "Use precompiled headers" OFF)
 
@@ -930,7 +933,6 @@ list(APPEND QT_INCLUDES ${Qt5Network_INCLUDE_DIRS})
 
 set(CMAKE_AUTOMOC OFF)
 
-
 # download qt static
 if( WIN32 )
   set(QT_STATIC_ZIP_FILENAME "qt_5_6_msvc2013_64_static.zip")