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

Merge branch 'feature/ninja0' into develop

Browse Source
This commit is contained in:
Sebastian Messmer 2020-06-29 23:42:44 -07:00
commit 7097adb8dc
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/README vendored
View File

@ -4,3 +4,4 @@ googletest: https://github.com/google/googletest/tree/release-1.10.0
cryptopp: https://github.com/weidai11/cryptopp/tree/CRYPTOPP_8_2_0 cryptopp: https://github.com/weidai11/cryptopp/tree/CRYPTOPP_8_2_0
- changed: added CMakeLists.txt and cryptopp-config.cmake from https://github.com/noloader/cryptopp-cmake/tree/CRYPTOPP_8_2_0 - changed: added CMakeLists.txt and cryptopp-config.cmake from https://github.com/noloader/cryptopp-cmake/tree/CRYPTOPP_8_2_0
- changed: commented out line including winapifamily.h in CMakeLists.txt - changed: commented out line including winapifamily.h in CMakeLists.txt
- changed: In CMakeLists.txt, rename BUILD_TESTING to CRYPTOPP_BUILD_TESTING so it doesn't clash with our BUILD_TESTING

2
vendor/cryptopp/CMakeLists.txt vendored
View File

@ -80,7 +80,7 @@ else()
endif() endif()
set(BUILD_TESTING OFF CACHE BOOL "") set(CRYPTOPP_BUILD_TESTING OFF CACHE BOOL "")
set(BUILD_DOCUMENTATION OFF CACHE BOOL "") set(BUILD_DOCUMENTATION OFF CACHE BOOL "")
set(BUILD_SHARED OFF CACHE BOOL "") set(BUILD_SHARED OFF CACHE BOOL "")
set(BUILD_STATIC ON CACHE BOOL "") set(BUILD_STATIC ON CACHE BOOL "")

6
vendor/cryptopp/vendor_cryptopp/CMakeLists.txt vendored
View File

@ -71,7 +71,7 @@ set(TEST_CXX_FILE ${TEST_PROG_DIR}/test_cxx.cxx)
option(BUILD_STATIC "Build static library" ON) option(BUILD_STATIC "Build static library" ON)
option(BUILD_SHARED "Build shared library" ON) option(BUILD_SHARED "Build shared library" ON)
option(BUILD_TESTING "Build library tests" ON) option(CRYPTOPP_BUILD_TESTING "Build library tests" ON)
option(BUILD_DOCUMENTATION "Use Doxygen to create the HTML based API documentation" OFF) option(BUILD_DOCUMENTATION "Use Doxygen to create the HTML based API documentation" OFF)
option(USE_INTERMEDIATE_OBJECTS_TARGET "Use a common intermediate objects target for the static and shared library targets" ON) option(USE_INTERMEDIATE_OBJECTS_TARGET "Use a common intermediate objects target for the static and shared library targets" ON)
@ -1105,7 +1105,7 @@ endif ()
#============================================================================ #============================================================================
enable_testing() enable_testing()
if (BUILD_TESTING) if (CRYPTOPP_BUILD_TESTING)
add_executable(cryptest ${cryptopp_SOURCES_TEST}) add_executable(cryptest ${cryptopp_SOURCES_TEST})
target_link_libraries(cryptest cryptopp-static) target_link_libraries(cryptest cryptopp-static)
@ -1186,7 +1186,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.8)
endif () endif ()
# Tests # Tests
if (BUILD_TESTING) if (CRYPTOPP_BUILD_TESTING)
install(TARGETS cryptest DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS cryptest DESTINATION ${CMAKE_INSTALL_BINDIR})
install(DIRECTORY ${SRC_DIR}/TestData DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cryptopp) install(DIRECTORY ${SRC_DIR}/TestData DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cryptopp)
install(DIRECTORY ${SRC_DIR}/TestVectors DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cryptopp) install(DIRECTORY ${SRC_DIR}/TestVectors DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cryptopp)