Sebastian Messmer
38575f258a
In CMakeLists.txt, rename BUILD_TESTING to CRYPTOPP_BUILD_TESTING so it doesn't clash with our BUILD_TESTING
2020-06-28 17:20:02 -07:00
Sebastian Messmer
4329279163
Add spdlog via conan and not via the vendor/ directory
2019-11-07 15:25:30 -05:00
Sebastian Messmer
ae09ff98aa
Add range-v3 via conan and not via the vendor/ directory
2019-11-05 10:08:00 -05:00
Sebastian Messmer
cb01025c81
Simplify mocking thanks to new googletest features
2019-10-25 23:38:04 -07:00
Sebastian Messmer
7d8cdbba40
Update to googletest 1.10.0
2019-10-19 18:38:54 -07:00
Sebastian Messmer
6164453c77
Use interface libraries for vendor libraries
2019-10-19 18:35:03 -07:00
Sebastian Messmer
67cfa06ca9
Add range-v3 library
2019-10-15 05:20:43 -07:00
Sebastian Messmer
ef4bc7aba2
Update to spdlog 1.4.2
2019-10-14 00:08:37 +08:00
Sebastian Messmer
50341b763c
Merge branch 'release/0.10' into develop
2019-06-08 13:33:06 -07:00
Sebastian Messmer
f3b71f058a
Update to spdlog 1.3.1
2019-06-03 19:09:13 -07:00
Sebastian Messmer
cba95beb17
Update to crypto++ 8.2
2019-06-01 20:34:28 -07:00
Sebastian Messmer
85cc1669a2
Merge from release/0.10
2019-04-03 18:44:48 -07:00
Sebastian Messmer
2150446a2c
Use paths relative to executable location to find subprocess executables
2019-03-23 22:01:26 -07:00
Sebastian Messmer
5596aa2a4f
Merge branch 'release/0.10' into develop
2019-03-02 21:38:07 -08:00
Sebastian Messmer
a2442bbbe9
Update to googletest 1.8.1
2019-02-28 01:22:34 -08:00
Sebastian Messmer
8c189c9ace
fix cmake crypto++
2019-02-28 01:22:04 -08:00
Sebastian Messmer
7b742f41e3
Update to cryptopp 8.1
2019-02-28 01:22:04 -08:00
Sebastian Messmer
6042d4ba6b
Build with OpenMP on Windows
2019-01-21 11:47:16 -08:00
Sebastian Messmer
38397a2d86
Cherry-pick some commits from Crypto++ to make OpenMP for scrypt work on Windows
2019-01-21 03:38:20 -08:00
Sebastian Messmer
7adbe4e3ca
Fix CryptoPP build on Windows
2019-01-19 13:01:43 -08:00
Sebastian Messmer
490abd5f31
Update to crypto++ 8.0. This fixes an bug where non-AESNI CPUs on Windows decrypted incorrectly
2019-01-12 16:36:23 -08:00
Sebastian Messmer
dedfe71297
Fix passing vars to cryptopp
2018-11-10 17:07:38 -08:00
Sebastian Messmer
08ed966808
OSX: If OpenMP is installed with homebrew or macports, auto-detect its setup
2018-10-15 18:02:52 +02:00
Sebastian Messmer
b66b7bfeb1
Fix OpenMP when installed from Homebrew
2018-10-01 01:31:08 -07:00
Sebastian Messmer
6b739bb7c9
Fix openmp for Ubuntu
2018-09-30 14:18:24 -07:00
Sebastian Messmer
4911fcd4f4
Use CMake targets provided by FindOpenMP instead of manually setting flags if possible
2018-09-28 12:04:50 -07:00
Sebastian Messmer
f90fb5a001
Fix debug mode detection for multi-mode builds like MSVC
2018-09-26 23:13:53 -07:00
Sebastian Messmer
2786558210
Pass through CRYPTOPP_DEBUG and OpenMP_CXX_FLAGS correctly to both, the cryptopp library and the code depending on it
2018-09-26 00:55:12 -07:00
Sebastian Messmer
e132ce4ca8
Disable OpenMP on MSVC because it doesn't support OpenMP 4.0 which is needed by crypto++ and then crashes the build.
2018-09-26 00:21:21 -07:00
Sebastian Messmer
3c10e095d8
Fix OpenMP for old CMake on Linux
2018-09-25 00:41:03 -07:00
Sebastian Messmer
a10dd04dea
Fix wrong handling of OpenMP on osx
2018-09-23 22:22:47 -07:00
Sebastian Messmer
ddc95903fe
Pass through debug flag to cryptopp
2018-07-08 20:07:49 -07:00
Sebastian Messmer
30874135a2
Further windows fixes
2018-07-08 20:06:59 -07:00
Sebastian Messmer
5b477493e7
Fix googletest update
2018-05-28 20:46:51 -07:00
Sebastian Messmer
b607921199
Update googletest dependency
2018-05-28 20:39:39 -07:00
Sebastian Messmer
c0aca65948
Fix CI
2018-05-21 08:09:37 -07:00
Sebastian Messmer
493f1bbc1c
Warn if OpenMP is disabled
2018-05-21 00:27:49 -07:00
Sebastian Messmer
d656aac59e
fix cmake
2018-05-20 19:21:59 -07:00
Sebastian Messmer
635a6c7bcd
Fix OpenMP for osx
2018-05-20 19:21:59 -07:00
Sebastian Messmer
a087f7dc8a
Enforce OpenMP build by default, but allow disabling it with a cmake flag
2018-05-20 19:21:59 -07:00
Sebastian Messmer
72f123e38e
Simplify and fix nits in cmake
2018-05-20 19:21:59 -07:00
Sebastian Messmer
ca68102a50
Prefer repository-cryptopp to system installed one
2018-05-20 19:21:59 -07:00
Sebastian Messmer
fedcd95668
Remove vendor/scrypt
2018-05-20 19:21:09 -07:00
Sebastian Messmer
9c98c5d788
Build cryptopp with OpenMP
2018-05-20 19:21:09 -07:00
Sebastian Messmer
6dbee297ce
Use cryptopp from vendor/ instead of system
2018-05-20 19:20:45 -07:00
Sebastian Messmer
97d2b21930
Remove cmake warning from cryptopp CMakeLists.txt
2018-05-20 19:20:45 -07:00
Sebastian Messmer
47ae3047e4
Add cryptopp library to vendor/
2018-05-20 19:20:45 -07:00
0x4D616E75
1a2036749c
Remove usage of old behavior from cmake 2.8 policy ( #217 )
...
* fix linking of fuse in cryfs-cli, linking of cpp-utils in cryfs tests and remove cmake policy to use behaviors of cmake 2.8 instead of 3.0
* setting link dependencies in cryfs project to public, remove transitive dependencies from cryfs-cli project and cryfs test project
* set gtest and gmock link dependencies from private to public in googletest project
2018-05-20 15:13:49 -07:00
Sebastian Messmer
44ea19d184
Better way to prevent googletest from installing
2018-05-19 12:33:28 -07:00
Sebastian Messmer
a691fd03dc
Update dependency to spdlog 0.16.3
2018-04-22 01:06:52 -07:00