diff options
| author | Egor Tensin <egor@tensin.name> | 2026-06-18 20:50:00 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-06-18 20:50:00 +0200 |
| commit | b6382a2f0a029d642a94c44f9089b69dd514a794 (patch) | |
| tree | 4684b36199d8e3d6a2bdcaf220b8b60a8ce02fa7 | |
| parent | switch to if constexpr (..) to remove clutter (diff) | |
| download | aes-tools-b6382a2f0a029d642a94c44f9089b69dd514a794.tar.gz aes-tools-b6382a2f0a029d642a94c44f9089b69dd514a794.zip | |
cmake: prettify CMakeLists.txt files
| -rw-r--r-- | aesxx/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | aesxx/utils/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 15 |
3 files changed, 17 insertions, 11 deletions
diff --git a/aesxx/CMakeLists.txt b/aesxx/CMakeLists.txt index 9a73e0b..704231e 100644 --- a/aesxx/CMakeLists.txt +++ b/aesxx/CMakeLists.txt @@ -3,9 +3,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) add_library(aesxx INTERFACE) target_include_directories(aesxx INTERFACE include/) -target_link_libraries(aesxx INTERFACE - aes - dbghelp) +target_link_libraries(aesxx INTERFACE aes dbghelp) if(MSVC_VERSION EQUAL 1900) # These annoying dbghelp.h warnings: diff --git a/aesxx/utils/CMakeLists.txt b/aesxx/utils/CMakeLists.txt index de6c206..470a313 100644 --- a/aesxx/utils/CMakeLists.txt +++ b/aesxx/utils/CMakeLists.txt @@ -6,7 +6,8 @@ function(add_util name src) target_link_libraries("${target}" PRIVATE aesxx Boost::disable_autolinking - Boost::program_options) + Boost::program_options + ) set_target_properties("${target}" PROPERTIES OUTPUT_NAME "${name}") install(TARGETS "${target}" RUNTIME DESTINATION bin) if(MSVC) @@ -19,7 +20,8 @@ set(block_util_headers block_dumper.hpp block_input.hpp data_parsers.hpp - helpers/command_line.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}) @@ -28,7 +30,8 @@ set(file_util_headers data_parsers.hpp file_cmd_parser.hpp helpers/command_line.hpp - helpers/file.hpp) + helpers/file.hpp +) add_util(encrypt_file encrypt_file.cpp ${file_util_headers}) add_util(decrypt_file decrypt_file.cpp ${file_util_headers}) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 26c0a58..9a38d0a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -8,7 +8,8 @@ add_test(NAME nist COMMAND Python3::Interpreter -- "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/nist.py" - --path "$<TARGET_FILE_DIR:util_encrypt_block>") + --path "$<TARGET_FILE_DIR:util_encrypt_block>" +) add_test(NAME nist_boxes COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/tools/ctest-driver.py" run @@ -18,7 +19,8 @@ add_test(NAME nist_boxes COMMAND Python3::Interpreter "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/nist.py" --path "$<TARGET_FILE_DIR:util_encrypt_block>" - --boxes) + --boxes +) add_test(NAME cavp COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/tools/ctest-driver.py" run @@ -27,7 +29,8 @@ add_test(NAME cavp COMMAND Python3::Interpreter -- "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/cavp.py" - --path "$<TARGET_FILE_DIR:util_encrypt_block>") + --path "$<TARGET_FILE_DIR:util_encrypt_block>" +) add_test(NAME cavp_boxes COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/tools/ctest-driver.py" run @@ -37,7 +40,8 @@ add_test(NAME cavp_boxes COMMAND Python3::Interpreter "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/cavp.py" --path "$<TARGET_FILE_DIR:util_encrypt_block>" - --boxes) + --boxes +) add_test(NAME file COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/tools/ctest-driver.py" run @@ -46,4 +50,5 @@ add_test(NAME file COMMAND Python3::Interpreter -- "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/file.py" - --path "$<TARGET_FILE_DIR:util_encrypt_file>") + --path "$<TARGET_FILE_DIR:util_encrypt_file>" +) |