From 5565f8f3295883de10614baec1cab8f36b726442 Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 13 Feb 2017 08:40:10 -0500 Subject: [PATCH] MINIFI-195: Update root CMAKE so testing can occur --- CMakeLists.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f19431e185..290a2b1b99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,16 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # Search for threads find_package(Threads REQUIRED) + +# Include OpenSSL +find_package (OpenSSL REQUIRED) +if (OPENSSL_FOUND) + include_directories(${OPENSSL_INCLUDE_DIR}) +else () + message( FATAL_ERROR "OpenSSL was not found. Please install OpenSSL" ) +endif (OPENSSL_FOUND) + + # Set the right openssl root path if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl/") @@ -66,6 +76,7 @@ add_subdirectory(thirdparty/yaml-cpp-yaml-cpp-0.5.3) add_subdirectory(libminifi) add_subdirectory(main) + # Generate source assembly set(ASSEMBLY_BASE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(CPACK_SOURCE_GENERATOR "TGZ") @@ -106,5 +117,5 @@ enable_testing(test) target_include_directories(tests PRIVATE BEFORE "thirdparty/yaml-cpp-yaml-cpp-0.5.3/include") target_include_directories(tests PRIVATE BEFORE "include") target_include_directories(tests PRIVATE BEFORE "libminifi/include/") - target_link_libraries(tests ${CMAKE_THREAD_LIBS_INIT} ${UUID_LIBRARIES} minifi yaml-cpp) + target_link_libraries(tests ${CMAKE_THREAD_LIBS_INIT} ${UUID_LIBRARIES} ${OPENSSL_LIBRARIES} minifi yaml-cpp) add_test(NAME LibMinifiTests COMMAND tests)