diff options
| author | Egor Tensin <egor@tensin.name> | 2026-06-06 01:03:09 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-06-06 01:05:46 +0200 |
| commit | 37e6d114d9b8624e36ffd0bdc8e37ede32dc7678 (patch) | |
| tree | d9e8240427182071bb02ea321090689baceec54f /aesxx | |
| parent | fix builds w/ modern MinGW (diff) | |
| download | aes-tools-37e6d114d9b8624e36ffd0bdc8e37ede32dc7678.tar.gz aes-tools-37e6d114d9b8624e36ffd0bdc8e37ede32dc7678.zip | |
cmake: upgrade cmake-common, introduce new features, etc.
Diffstat (limited to 'aesxx')
| -rw-r--r-- | aesxx/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | aesxx/utils/CMakeLists.txt | 25 |
2 files changed, 22 insertions, 7 deletions
diff --git a/aesxx/CMakeLists.txt b/aesxx/CMakeLists.txt index 0f814b8..378bad7 100644 --- a/aesxx/CMakeLists.txt +++ b/aesxx/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(Boost REQUIRED) +find_package(Boost CONFIG REQUIRED) add_library(aesxx INTERFACE) target_include_directories(aesxx INTERFACE include/) @@ -9,7 +9,7 @@ target_link_libraries(aesxx INTERFACE Boost::boost) if(MSVC_VERSION EQUAL 1900) - # These annoying DbgHelp.h warnings: + # These annoying dbghelp.h warnings: # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h target_compile_options(aesxx INTERFACE /wd4091) endif() diff --git a/aesxx/utils/CMakeLists.txt b/aesxx/utils/CMakeLists.txt index 98b07f1..9ee06d0 100644 --- a/aesxx/utils/CMakeLists.txt +++ b/aesxx/utils/CMakeLists.txt @@ -1,20 +1,35 @@ -find_package(Boost REQUIRED COMPONENTS filesystem program_options) +find_package(Boost CONFIG REQUIRED COMPONENTS filesystem program_options) function(add_util name src) set(target "util_${name}") add_executable("${target}" ${src}) - target_link_libraries("${target}" PRIVATE aesxx Boost::disable_autolinking Boost::filesystem Boost::program_options) + target_link_libraries("${target}" PRIVATE + aesxx + Boost::disable_autolinking + Boost::filesystem + Boost::program_options) set_target_properties("${target}" PROPERTIES OUTPUT_NAME "${name}") install(TARGETS "${target}" RUNTIME DESTINATION bin) - install_pdbs(TARGETS "${target}" DESTINATION bin) + if(MSVC) + install(FILES "$<TARGET_PDB_FILE:${target}>" DESTINATION bin OPTIONAL) + endif() endfunction() -set(block_util_headers block_cmd_parser.hpp block_dumper.hpp block_input.hpp data_parsers.hpp helpers/command_line.hpp) +set(block_util_headers + block_cmd_parser.hpp + block_dumper.hpp + block_input.hpp + data_parsers.hpp + helpers/command_line.hpp) add_util(encrypt_block encrypt_block.cpp ${block_util_headers}) add_util(decrypt_block decrypt_block.cpp ${block_util_headers}) -set(file_util_headers data_parsers.hpp file_cmd_parser.hpp helpers/command_line.hpp helpers/file.hpp) +set(file_util_headers + data_parsers.hpp + file_cmd_parser.hpp + helpers/command_line.hpp + helpers/file.hpp) add_util(encrypt_file encrypt_file.cpp ${file_util_headers}) add_util(decrypt_file decrypt_file.cpp ${file_util_headers}) |