From 1409b061b7c2e3a6ebaec6acede66890b8cc11ac Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 29 Mar 2019 00:35:31 -0700 Subject: [PATCH] Update to DokanY 1.2.1 and Boost 1.67 on Windows --- ChangeLog.txt | 1 + README.md | 2 +- appveyor.yml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index e1f9d1e8..90d2170d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -11,6 +11,7 @@ Compatibility: Other: * Updated to crypto++ 8.1 +* Updated to DokanY 1.2.1 * Unit tests can now be run from any directory diff --git a/README.md b/README.md index 41a99aef..ffea44e6 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Building on Windows (experimental) Build with Visual Studio 2017 and pass in the following flags to CMake: - -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.1.0"] + -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.2.1"] -DBOOST_ROOT=[path to root of boost installation] If you set these variables correctly in the `CMakeSettings.json` file, you should be able to open the cryfs source folder with Visual Studio 2017. diff --git a/appveyor.yml b/appveyor.yml index 7085040e..46ef3d44 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,14 +25,14 @@ init: - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\%VisualStudioVersion%\Community\VC\Auxiliary\Build\vcvars%arch%.bat" install: - - choco install -y dokany --version 1.1.0.2000 --installargs INSTALLDEVFILES=1 + - choco install -y dokany --version 1.2.1.2000 --installargs INSTALLDEVFILES=1 - cmake --version build_script: - cmd: mkdir build - cmd: cd build # note: The cmake+ninja workflow requires us to set build type in both cmake commands ('cmake' and 'cmake --build'), otherwise the cryfs.exe will depend on debug versions of the visual studio c++ runtime (i.e. msvcp140d.dll) - - cmd: cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_TESTING=on -DBOOST_ROOT="C:/Libraries/boost_1_65_1" -DDOKAN_PATH="C:/Program Files/Dokan/DokanLibrary-1.1.0" + - cmd: cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_TESTING=on -DBOOST_ROOT="C:/Libraries/boost_1_67_0" -DDOKAN_PATH="C:/Program Files/Dokan/DokanLibrary-1.2.1" - cmd: cmake --build . --config %CONFIGURATION% - cmd: .\test\gitversion\gitversion-test.exe # cpp-utils-test disables ThreadDebuggingTest_ThreadName.*_thenIsCorrect because the appveyor image is too old to support the API needed for that