CMakeLists.txt updates

3 files changed, 59 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d3a6c8..2eed01d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,50 +1,67 @@
 project(aes_tools)
 
-if(MSVC)
-    add_compile_options(/MP /W4)
-elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    add_compile_options(-Wall -Wextra)
-endif()
-
 get_directory_property(parent_directory PARENT_DIRECTORY)
 set(is_root_project $<NOT:parent_directory>)
 
+set(AES_TOOLS_USE_STATIC_RUNTIME "${is_root_project}" CACHE BOOL "Link the runtime statically")
+set(AES_TOOLS_STRIP_SYMBOL_TABLE "${is_root_project}" CACHE BOOL "Strip symbol tables")
+
+set(AES_TOOLS_ASM OFF CACHE BOOL "Use the assembly language implementation instead of the one in C")
+
+if(is_root_project)
+    if(MSVC)
+        add_compile_options(/MP /W4)
+    elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+        add_compile_options(-Wall -Wextra)
+    endif()
+endif()
+
 function(use_static_runtime_msvc target)
-    target_compile_options(${target} PRIVATE
+    target_compile_options("${target}" PRIVATE
         $<$<CONFIG:Debug>:/MTd>
-        $<$<CONFIG:Release>:/MT>)
+        $<$<NOT:$<CONFIG:Debug>>:/MT>)
 endfunction()
 
 function(use_static_runtime_gcc target)
-    get_target_property(type ${target} TYPE)
-    if(type STREQUAL EXECUTABLE)
-        target_link_libraries(${target} PRIVATE -static)
+    get_target_property(target_type "${target}" TYPE)
+    if(target_type STREQUAL EXECUTABLE)
+        target_link_libraries("${target}" PRIVATE -static)
     endif()
 endfunction()
 
 function(use_static_runtime target)
     if(MSVC)
-        use_static_runtime_msvc(${target})
+        use_static_runtime_msvc("${target}")
     elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-        use_static_runtime_gcc(${target})
+        use_static_runtime_gcc("${target}")
+    else()
+        message(WARNING "Unrecognized toolset")
     endif()
 endfunction()
 
 function(strip_symbol_table_gcc target)
-    target_link_libraries(${target} PRIVATE $<$<CONFIG:Release>:-s>)
+    target_link_libraries("${target}" PRIVATE
+        $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>>:-s>)
 endfunction()
 
 function(strip_symbol_table target)
-    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-        strip_symbol_table_gcc(${target})
+    if(MSVC)
+    elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+        strip_symbol_table_gcc("${target}")
+    else()
+        message(WARNING "Unrecognized toolset")
     endif()
 endfunction()
 
 macro(add_executable target)
     _add_executable(${ARGV})
-    if(TARGET ${target} AND is_root_project)
-        use_static_runtime(${target})
-        strip_symbol_table(${target})
+    if(TARGET "${target}")
+        if(AES_TOOLS_USE_STATIC_RUNTIME)
+            use_static_runtime("${target}")
+        endif()
+        if(AES_TOOLS_STRIP_SYMBOL_TABLE)
+            strip_symbol_table("${target}")
+        endif()
     endif()
 endmacro()
 
@@ -55,7 +72,7 @@ if(MSVC AND AES_TOOLS_ASM)
     file(GLOB libaes_c_sources "src/*.c")
     file(GLOB libaes_asm_sources "src/asm/*.asm")
     set(libaes_sources ${libaes_asm_sources} ${libaes_c_sources})
-    set_source_files_properties(${libaes_asm_sources} PROPERTIES COMPILE_FLAGS "/safeseh")
+    set_source_files_properties(${libaes_asm_sources} 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 libaes_sources "src/*.c")
@@ -63,10 +80,15 @@ endif()
 
 add_library(libaes ${libaes_sources} ${libaes_headers})
 target_include_directories(libaes PUBLIC include/)
-use_static_runtime(libaes)
 
-if(MSVC)
-    target_compile_definitions(libaes PRIVATE _CRT_SECURE_NO_WARNINGS)
+if(AES_TOOLS_USE_STATIC_RUNTIME)
+    use_static_runtime(libaes)
+endif()
+
+if(is_root_project)
+    if(MSVC)
+        target_compile_definitions(libaes PRIVATE _CRT_SECURE_NO_WARNINGS)
+    endif()
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
diff --git a/README.md b/README.md
index da93b5c..7318f29 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,8 @@ x86 and using static Boost libraries):
 
     > cmake -G "Visual Studio 12 2013" ^
         -D BOOST_ROOT=C:\workspace\third-party\boost_1_58_0 ^
-        -D Boost_USE_STATIC_LIBS=ON ^
+        -D Boost_USE_STATIC_LIBS=ON    ^
+        -D Boost_USE_STATIC_RUNTIME=ON ^
         C:\workspace\personal\aes-tools
     ...
 
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 2aecf59..c159e75 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -4,32 +4,38 @@ endif()
 
 find_package(Boost REQUIRED COMPONENTS filesystem program_options system)
 
-add_executable(util_encrypt_block encrypt_block.cpp block_cmd_parser.hpp block_dumper.hpp block_input.hpp data_parsers.hpp)
+set(block_util_headers block_cmd_parser.hpp block_dumper.hpp block_input.hpp data_parsers.hpp)
+
+add_executable(util_encrypt_block encrypt_block.cpp ${block_util_headers})
 target_include_directories(util_encrypt_block SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(util_encrypt_block PRIVATE libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_encrypt_block PROPERTIES OUTPUT_NAME encrypt_block)
 
-add_executable(util_decrypt_block decrypt_block.cpp block_cmd_parser.hpp block_dumper.hpp block_input.hpp data_parsers.hpp)
+add_executable(util_decrypt_block decrypt_block.cpp ${block_util_headers})
 target_include_directories(util_decrypt_block SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(util_decrypt_block PRIVATE libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_decrypt_block PROPERTIES OUTPUT_NAME decrypt_block)
 
-add_executable(util_encrypt_file encrypt_file.cpp data_parsers.hpp file_cmd_parser.hpp helpers/file.hpp)
+set(file_util_headers data_parsers.hpp file_cmd_parser.hpp helpers/file.hpp)
+
+add_executable(util_encrypt_file encrypt_file.cpp ${file_util_headers})
 target_include_directories(util_encrypt_file SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(util_encrypt_file PRIVATE libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_encrypt_file PROPERTIES OUTPUT_NAME encrypt_file)
 
-add_executable(util_decrypt_file decrypt_file.cpp data_parsers.hpp file_cmd_parser.hpp helpers/file.hpp)
+add_executable(util_decrypt_file decrypt_file.cpp ${file_util_headers})
 target_include_directories(util_decrypt_file SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(util_decrypt_file PRIVATE libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_decrypt_file PROPERTIES OUTPUT_NAME decrypt_file)
 
-add_executable(util_encrypt_bmp encrypt_bmp.cpp data_parsers.hpp file_cmd_parser.hpp helpers/bmp.hpp helpers/file.hpp)
+set(bmp_util_headers ${file_util_headers} helpers/bmp.hpp)
+
+add_executable(util_encrypt_bmp encrypt_bmp.cpp ${bmp_util_headers})
 target_include_directories(util_encrypt_bmp SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(util_encrypt_bmp PRIVATE libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_encrypt_bmp PROPERTIES OUTPUT_NAME encrypt_bmp)
 
-add_executable(util_decrypt_bmp decrypt_bmp.cpp data_parsers.hpp file_cmd_parser.hpp helpers/bmp.hpp helpers/file.hpp)
+add_executable(util_decrypt_bmp decrypt_bmp.cpp ${bmp_util_headers})
 target_include_directories(util_decrypt_bmp SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(util_decrypt_bmp PRIVATE libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_decrypt_bmp PROPERTIES OUTPUT_NAME decrypt_bmp)