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

Pass through CRYPTOPP_DEBUG and OpenMP_CXX_FLAGS correctly to both, the cryptopp library and the code depending on it

Browse Source
This commit is contained in:
Sebastian Messmer 2018-09-26 00:55:12 -07:00
parent e132ce4ca8
commit 2786558210
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vendor/cryptopp/CMakeLists.txt vendored
View File

@ -5,7 +5,8 @@ add_library(cryptopp dummy.cpp)
target_include_directories(cryptopp SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(cryptopp SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(cryptopp PUBLIC -DCRYPTOPP_DEBUG) target_compile_definitions(cryptopp PUBLIC -DCRYPTOPP_DEBUG) # add to all targets depending on this
add_compile_options(-DCRYPTOPP_DEBUG) # add to stuff built in subdirectories (like the actual library)
endif() endif()
if(NOT DISABLE_OPENMP) if(NOT DISABLE_OPENMP)
@ -14,6 +15,7 @@ if(NOT DISABLE_OPENMP)
# Workaround because older cmake on apple doesn't support FindOpenMP # Workaround because older cmake on apple doesn't support FindOpenMP
message(STATUS "Applying workaround for OSX OpenMP") message(STATUS "Applying workaround for OSX OpenMP")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fopenmp") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fopenmp")
target_compile_options(cryptopp PUBLIC -Xclang -fopenmp) # also add these flags to all libraries depending on this
target_link_libraries(cryptopp PRIVATE -lomp) target_link_libraries(cryptopp PRIVATE -lomp)
elseif(MSVC) elseif(MSVC)
message(WARNING "MSVC does not support the OpenMP 4.0 standard used by Crypto++. Disabling OpenMP. This can cause degraded performance.") message(WARNING "MSVC does not support the OpenMP 4.0 standard used by Crypto++. Disabling OpenMP. This can cause degraded performance.")
@ -29,6 +31,9 @@ if(NOT DISABLE_OPENMP)
message(STATUS "Using OpenMP library: ${OpenMP_CXX_LIBRARIES}") message(STATUS "Using OpenMP library: ${OpenMP_CXX_LIBRARIES}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
target_link_libraries(cryptopp PRIVATE ${OpenMP_CXX_LIBRARIES}) target_link_libraries(cryptopp PRIVATE ${OpenMP_CXX_LIBRARIES})
# also add these flags to all libraries depending on this
string(REPLACE " " ";" REPLACED_FLAGS ${OpenMP_CXX_FLAGS})
target_compile_options(cryptopp PUBLIC ${REPLACED_FLAGS})
else(OPENMP_FOUND) else(OPENMP_FOUND)
message(FATAL_ERROR "Did not find OpenMP. Build with -DDISABLE_OPENMP=ON if you want to allow this and are willing to take the performance hit.") message(FATAL_ERROR "Did not find OpenMP. Build with -DDISABLE_OPENMP=ON if you want to allow this and are willing to take the performance hit.")
endif(OPENMP_FOUND) endif(OPENMP_FOUND)