From d21f141bf68959d5ec8225387e940ed6980ba1f2 Mon Sep 17 00:00:00 2001 From: Jacob Lauritzen Date: Fri, 7 Jan 2022 10:01:50 +0100 Subject: [PATCH] Introduce OATPP_LINK_TEST_LIBRARY --- CMakeLists.txt | 7 +++++-- cmake/module-utils.cmake | 12 ++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee3a693..19c23ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF) option(OATPP_DIR_SRC "Path to oatpp module directory (sources)") option(OATPP_DIR_LIB "Path to directory with liboatpp (directory containing ex: liboatpp.so or liboatpp.dynlib)") option(OATPP_BUILD_TESTS "Build tests for this module" ON) +option(OATPP_LINK_TEST_LIBRARY "Link oat++ test library" ON) option(OATPP_INSTALL "Install module binaries" ON) option(OATPP_MSVC_LINK_STATIC_RUNTIME "MSVC: Link with static runtime (/MT and /MTd)." OFF) @@ -48,8 +49,10 @@ if(OATPP_MODULES_LOCATION STREQUAL OATPP_MODULES_LOCATION_INSTALLED) get_target_property(OATPP_INCLUDE oatpp::oatpp INTERFACE_INCLUDE_DIRECTORIES) message("OATPP_INCLUDE=${OATPP_INCLUDE}") - get_target_property(OATPP_TEST_INCLUDE oatpp::oatpp-test INTERFACE_INCLUDE_DIRECTORIES) - message("OATPP_TEST_INCLUDE=${OATPP_TEST_INCLUDE}") + if(OATPP_BUILD_TESTS) + get_target_property(OATPP_TEST_INCLUDE oatpp::oatpp-test INTERFACE_INCLUDE_DIRECTORIES) + message("OATPP_TEST_INCLUDE=${OATPP_TEST_INCLUDE}") + endif() elseif(OATPP_MODULES_LOCATION STREQUAL OATPP_MODULES_LOCATION_EXTERNAL) diff --git a/cmake/module-utils.cmake b/cmake/module-utils.cmake index 8f1d35a..5c05d50 100644 --- a/cmake/module-utils.cmake +++ b/cmake/module-utils.cmake @@ -6,8 +6,12 @@ macro(target_link_oatpp target) target_link_libraries(${target} PRIVATE oatpp::oatpp - PRIVATE oatpp::oatpp-test ) + if(OATPP_LINK_TEST_LIBRARY) + target_link_libraries(${target} + PRIVATE oatpp::oatpp-test + ) + endif() else() @@ -17,8 +21,12 @@ macro(target_link_oatpp target) #target_link_directories(${target} PRIVATE ${OATPP_DIR_LIB}) target_link_libraries(${target} PRIVATE oatpp - PRIVATE oatpp-test ) + if(OATPP_LINK_TEST_LIBRARY) + target_link_libraries(${target} + PRIVATE oatpp-test + ) + endif() endif()