From 2c732913f7e386e555a5cdf2b2e5394f90cd1a47 Mon Sep 17 00:00:00 2001
From: White <jtwhite1000@gmail.com>
Date: Thu, 17 Sep 2020 10:06:53 -0600
Subject: [PATCH 1/4] merge upstream

---
 docs/.DS_Store | Bin 6148 -> 8196 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/.DS_Store b/docs/.DS_Store
index 2ea9174d7a0195c30f851b40d0ae2fd8a2d20269..76fbb4dc9a1aede3c3a39b05c06fb9eab48d7719 100644
GIT binary patch
delta 355
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aKK3KC!h@);QN8HyQ78FGOzakC)v
zH<rx`%xjqzvvY7vY+#WEDdS;?XGjDpDM41sP{dF<S%#^f!_3T5N5Rz4X!2$zM^&6k
z%YuvYa`N-iLAFljVVcijVPvACU}9+r)E3Ln4z!^dXnrCPXEG#Xm}`ut0NFI4iCjSK
zB@C%R9~3a;fDK7yD8?{E5vwv}qc+>{Tw>;u;07A$3JNM<aC~Q;%rD|N*_}s#0~lJM
M&|ugc&ohS^0I&y1%>V!Z

delta 150
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGjUEV6q~50D9Qwq2aDw}q$HIW7bNB6Cv7ZT
z&N$gXhGnvb;2aKfOEVn>QzMJX`vn{)^9spqEcwo|n4N<|kQt~I2n4u+ge%C%jfLNt
bC-ciVg6sqt$^xQ+7Jw`Ti*1hQnZpbK9y%H8


From ac4bead4d027d6759523dbbfef9352ca3289c5ad Mon Sep 17 00:00:00 2001
From: Jeremy White <jtwhite1000@gmail.com>
Date: Fri, 30 Oct 2020 14:15:43 -0600
Subject: [PATCH 2/4] working to build pestpp on appveyor

---
 appveyor.yml      |  11 +++++++++--
 bin/mac/.DS_Store | Bin 6148 -> 0 bytes
 2 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 bin/mac/.DS_Store

diff --git a/appveyor.yml b/appveyor.yml
index f03eb6cd8..5faf79173 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,8 +18,15 @@ init:
   - echo %PYTHON_VERSION% %CONDA_INSTALL_LOCN%
 
 install:
-  - git clone -b develop --depth 1 https://github.com/jtwhite79/pestpp
-  - copy /Y pestpp\bin\win\*.* bin\win\
+  - git clone -b develop --depth 1 https://github.com/usgs/pestpp
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - cd pestpp
+  - mkdir build
+  - cd build
+  - cmake -GNinja -DCMAKE_BUILD_TYPE=Release ..
+  - cd ..
+  - cd ..
+  - copy /Y pestpp\bin\*.* bin\win\
   - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
   - set PYTHONUNBUFFERED=1
   # for msinttypes and newer stuff
diff --git a/bin/mac/.DS_Store b/bin/mac/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I


From 029d3967ed15f973724d329c972190e401902c00 Mon Sep 17 00:00:00 2001
From: Jeremy White <jtwhite1000@gmail.com>
Date: Mon, 2 Nov 2020 07:55:54 -0700
Subject: [PATCH 3/4] working to build pestpp on appveyor

---
 appveyor.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5faf79173..22b54fb44 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,13 +1,12 @@
+
+image: Visual Studio 2017
+platform: x64
 environment:
   
   matrix:
     - PYTHON_VERSION: "3.6"
       CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
 
-
-platform:
-    - x64
-
 build: false
 
 cache:

From b9609b609ad163edef34b3fcf49dd9b3453ed6c8 Mon Sep 17 00:00:00 2001
From: Jeremy White <jtwhite1000@gmail.com>
Date: Mon, 2 Nov 2020 08:08:12 -0700
Subject: [PATCH 4/4] working to build pestpp on appveyor

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 22b54fb44..ea3de2c13 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,6 +23,7 @@ install:
   - mkdir build
   - cd build
   - cmake -GNinja -DCMAKE_BUILD_TYPE=Release ..
+  - ninja -j2
   - cd ..
   - cd ..
   - copy /Y pestpp\bin\*.* bin\win\