StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

add pthread flag

Browse Source
This commit is contained in:
Thomas Fussell 2016-10-24 23:11:15 -04:00
parent ee7f9bdb03
commit 0359d1404c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/xlnt.test.cmake
View File

@ -51,10 +51,13 @@ source_group(tests\\workbook FILES ${WORKBOOK_TESTS})
source_group(tests\\worksheet FILES ${WORKSHEET_TESTS}) source_group(tests\\worksheet FILES ${WORKSHEET_TESTS})
source_group(runner FILES ${RUNNER}) source_group(runner FILES ${RUNNER})
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
if(SHARED) if(SHARED)
target_link_libraries(xlnt.test xlnt.shared) target_link_libraries(xlnt.test xlnt.shared Threads::Threads)
else() else()
target_link_libraries(xlnt.test xlnt.static) target_link_libraries(xlnt.test xlnt.static Threads::Threads)
endif() endif()
if(MSVC) if(MSVC)

2
source/detail/xlsx_crypto.cpp
View File

@ -307,7 +307,7 @@ struct agile_encryption_info
std::size_t hash_size; std::size_t hash_size;
std::string cipher_algorithm; std::string cipher_algorithm;
std::string cipher_chaining; std::string cipher_chaining;
enum class hash_algorithm hash_algorithm; enum hash_algorithm hash_algorithm;
std::vector<std::uint8_t> salt_value; std::vector<std::uint8_t> salt_value;
std::vector<std::uint8_t> verifier_hash_input; std::vector<std::uint8_t> verifier_hash_input;
std::vector<std::uint8_t> verifier_hash_value; std::vector<std::uint8_t> verifier_hash_value;