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

Simplify and fix nits in cmake

This commit is contained in:
Sebastian Messmer 2018-05-20 14:11:54 -07:00
parent dfd6a0414f
commit 72f123e38e
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -15,19 +15,14 @@ require_gcc_version(4.8)
require_clang_version(3.7) require_clang_version(3.7)
# Default value is not to build test cases # Default value is not to build test cases
if(NOT BUILD_TESTING) option(BUILD_TESTING "build test cases" OFF)
set(BUILD_TESTING OFF CACHE BOOL "BUILD_TESTING") option(CRYFS_UPDATE_CHECKS "let cryfs check for updates and security vulnerabilities" ON)
endif(NOT BUILD_TESTING)
# Default value is to build in release mode # Default value is to build in release mode
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE INTERNAL "CMAKE_BUILD_TYPE") set(CMAKE_BUILD_TYPE Release CACHE INTERNAL "CMAKE_BUILD_TYPE")
endif(NOT CMAKE_BUILD_TYPE) endif(NOT CMAKE_BUILD_TYPE)
# Default value is to do update checks
if(NOT CRYFS_UPDATE_CHECKS)
set(CRYFS_UPDATE_CHECKS ON CACHE BOOL "CRYFS_UPDATE_CHECKS")
endif(NOT CRYFS_UPDATE_CHECKS)
add_subdirectory(vendor) add_subdirectory(vendor)
add_subdirectory(src) add_subdirectory(src)

2
vendor/cryptopp/CMakeLists.txt vendored
View File

@ -10,7 +10,7 @@ if(OPENMP_FOUND)
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_FLAGS}) target_link_libraries(cryptopp PRIVATE ${OpenMP_CXX_FLAGS})
else(OPENMP_FOUND) else(OPENMP_FOUND)
message(WARN "Did not find OpenMP. Performance might be degraded.") message(WARNING "Did not find OpenMP. Performance might be degraded.")
endif(OPENMP_FOUND) endif(OPENMP_FOUND)