diff --git a/appveyor.yml b/appveyor.yml index f03eb6cd8..ea3de2c13 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: @@ -18,8 +17,16 @@ 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 .. + - ninja -j2 + - 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 5008ddfcf..000000000 Binary files a/bin/mac/.DS_Store and /dev/null differ diff --git a/docs/.DS_Store b/docs/.DS_Store index 2ea9174d7..76fbb4dc9 100644 Binary files a/docs/.DS_Store and b/docs/.DS_Store differ