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
Sebastian Messmer
d13f1b7729
Fix clang-tidy warning in gtest
2017-12-01 14:58:52 +00:00
Sebastian Messmer
76e7f7da72
Introduce clang-tidy and fix corresponding warnings
2017-10-27 04:02:51 +01:00
Sebastian Messmer
5dfaf948b7
Hide not-helpful compiler warning in scrypt code
2017-10-27 04:01:33 +01:00
Sebastian Messmer
5f4eb2d868
Hide clang warning about missing overrides in MOCK_METHOD() definitions
2017-10-27 04:00:52 +01:00
Sebastian Messmer
936d49ea50
Update to spdlog 0.14
2017-09-19 00:37:15 +01:00
Sebastian Messmer
5269734003
Re-establish compatibility with GCC 4.8
2017-09-10 13:35:07 +01:00
Sebastian Messmer
d92a632a45
Update to spdlog 0.13.0
2017-07-07 16:26:18 +02:00
Sebastian Messmer
3d2f133c42
Update to scrypt 1.2.1
2017-07-07 16:19:31 +02:00
Sebastian Messmer
f1c6fa044f
Update to spdlog 0.12.0
2017-03-16 22:33:05 +00:00
Sebastian Messmer
9a304fc52b
Upgrade spdlog to 0.11.0
2017-02-04 19:03:20 +00:00
Sebastian Messmer
a2fabac8da
Upgrade to googletest 1.8.0
2017-01-08 18:51:01 +00:00
Sebastian Messmer
a32636842e
For scrypt compilation, use the cpusupport-config.h created by the scrypt build
2016-10-05 09:07:37 +02:00
Sebastian Messmer
72b6874c12
Add fix for compiling the scrypt module under hardening-wrapper
2016-10-04 20:45:26 +02:00
Sebastian Messmer
5753e4f71c
Switch to new git version number recognition
2016-03-02 13:53:37 +01:00
Sebastian Messmer
04283141ca
Don't pass CXXFLAGS to scrypt compilation process
2016-02-16 23:26:04 +01:00
Sebastian Messmer
c889366619
Add some default search paths for libraries on Mac OS X
2016-02-15 20:01:13 +01:00
Sebastian Messmer
b84c8d63fd
When test cases are build, disable "make install", because this would also install gtest libraries.
2016-02-14 17:01:24 +01:00
Sebastian Messmer
079d73a0ea
Update spdlog: Allow syslog loggers on Mac
2016-02-13 15:54:01 +01:00
Sebastian Messmer
3ff69b6a9f
Allow specifying osxfuse include directory on command line using "cmake -DCMAKE_CXX_FLAGS=-I/path/to/osxfuse/include/dir". Furthermore, add some setup instructions for installing the requirements on Mac OS X.
2016-02-13 02:07:19 +01:00
Sebastian Messmer
0163029f3c
In a release build, also compile scrypt library with optimization flags.
2016-02-12 21:58:37 +01:00
Sebastian Messmer
d4272ea442
Make scrypt compilation step work on 32bit
2016-02-12 21:22:08 +01:00
Sebastian Messmer
3ecbef6d11
Fix CPack package generation
2016-02-12 11:12:14 +01:00
Sebastian Messmer
8f5e5640de
Be more explicit in comment
2016-02-12 10:57:11 +01:00
Sebastian Messmer
19bc87ea30
Removed debug output
2016-02-12 10:16:52 +01:00
Sebastian Messmer
7734566bbd
Update gitversion
2016-02-11 23:53:23 +01:00
