hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'origin/hotfix/win_openmp' into release/0.10

Browse Source
This commit is contained in:
Sebastian Messmer 2019-01-21 23:18:21 -08:00
commit 3c5feec86f
1 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/cryptopp/CMakeLists.txt vendored
View File

@ -9,9 +9,6 @@ target_compile_definitions(cryptopp PUBLIC $<$<CONFIG:Debug>:CRYPTOPP_DEBUG>) #
add_compile_options($<$<CONFIG:Debug>:-DCRYPTOPP_DEBUG>) # add to stuff built in subdirectories (like the actual library) add_compile_options($<$<CONFIG:Debug>:-DCRYPTOPP_DEBUG>) # add to stuff built in subdirectories (like the actual library)
if(NOT DISABLE_OPENMP) if(NOT DISABLE_OPENMP)
if (MSVC)
message(WARNING "MSVC does not support the OpenMP 4.0 standard used by Crypto++. Disabling OpenMP. This can cause degraded performance.")
else()
find_package(OpenMP) find_package(OpenMP)
if (OPENMP_FOUND OR OPENMP_CXX_FOUND) if (OPENMP_FOUND OR OPENMP_CXX_FOUND)
@ -78,7 +75,6 @@ if(NOT DISABLE_OPENMP)
message(STATUS "OpenMP flags: ${OpenMP_CXX_FLAGS}") message(STATUS "OpenMP flags: ${OpenMP_CXX_FLAGS}")
string(REPLACE " " ";" REPLACED_FLAGS ${OpenMP_CXX_FLAGS}) string(REPLACE " " ";" REPLACED_FLAGS ${OpenMP_CXX_FLAGS})
add_compile_options(${REPLACED_FLAGS}) add_compile_options(${REPLACED_FLAGS})
endif()
else() else()
message(WARNING "OpenMP is disabled. This can cause degraded performance.") message(WARNING "OpenMP is disabled. This can cause degraded performance.")
endif() endif()