From 5d34f0fca6ac458606a6637efd27a3ab202ced5a Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 21 Dec 2019 14:58:53 +0300 Subject: aes: prettify CMakeLists.txt --- aes/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'aes/CMakeLists.txt') diff --git a/aes/CMakeLists.txt b/aes/CMakeLists.txt index 0ec262d..a19d3b7 100644 --- a/aes/CMakeLists.txt +++ b/aes/CMakeLists.txt @@ -1,19 +1,18 @@ option(AES_TOOLS_ASM "Use the assembly language implementation instead of the one in C") file(GLOB_RECURSE aes_include "include/*.h") +file(GLOB aes_src "src/*.c") if(MSVC AND AES_TOOLS_ASM) enable_language(ASM_MASM) - file(GLOB aes_src_c "src/*.c") - file(GLOB aes_src_asm "src/asm/*.asm") - set(aes_src ${aes_src_asm} ${aes_src_c}) - set_source_files_properties(${aes_src_asm} PROPERTIES COMPILE_FLAGS /safeseh) + file(GLOB aes_src_impl "src/asm/*.asm") + set_source_files_properties(${aes_src_impl} PROPERTIES COMPILE_FLAGS /safeseh) # Setting CMAKE_ASM_MASM_FLAGS doesn't work: http://www.cmake.org/Bug/view.php?id=14711 else() - file(GLOB_RECURSE aes_src "src/*.c") + file(GLOB aes_src_impl "src/c/*.c") endif() -add_library(aes ${aes_src} ${aes_include}) +add_library(aes ${aes_include} ${aes_src} ${aes_src_impl}) target_include_directories(aes PUBLIC include/) if(MSVC) -- cgit v1.2.3