aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--aesxx/CMakeLists.txt2
-rw-r--r--test/CMakeLists.txt1
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5553e60..cd0acea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,12 @@
cmake_minimum_required(VERSION 3.5) # for Boost::* imported targets
project(aes_tools C CXX)
-
enable_testing()
include(cmake/common.cmake)
add_subdirectory(aes)
add_subdirectory(aesxx)
-
add_subdirectory(test)
install(FILES LICENSE.txt DESTINATION share)
diff --git a/aesxx/CMakeLists.txt b/aesxx/CMakeLists.txt
index 7f5a58a..2c4a9a5 100644
--- a/aesxx/CMakeLists.txt
+++ b/aesxx/CMakeLists.txt
@@ -2,7 +2,7 @@ find_package(Boost REQUIRED)
add_library(aesxx INTERFACE)
target_include_directories(aesxx INTERFACE include/)
-target_link_libraries(aesxx INTERFACE aes Boost::boost)
+target_link_libraries(aesxx INTERFACE aes Boost::disable_autolinking Boost::boost)
if(MSVC_VERSION EQUAL 1900)
# These annoying DbgHelp.h warnings:
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1445141..c713ca4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,5 @@
find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
add_test(NAME nist COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/nist.py" --path "$<TARGET_FILE_DIR:util_encrypt_block>")
add_test(NAME nist_boxes COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/nist.py" --path "$<TARGET_FILE_DIR:util_encrypt_block>" --boxes)
add_test(NAME cavp COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/cavp.py" --path "$<TARGET_FILE_DIR:util_encrypt_block>")