From 0691e605877c4a13777021597f1e90e855639e13 Mon Sep 17 00:00:00 2001 From: Mateusz Loskot Date: Thu, 28 Feb 2013 23:56:11 +0000 Subject: [PATCH] Export SOCI_CORE_TARGET_STATIC to parent scope Rename left over old name -static to _static --- src/cmake/SociBackend.cmake | 2 +- src/core/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cmake/SociBackend.cmake b/src/cmake/SociBackend.cmake index a77dfc0a2..464749364 100644 --- a/src/cmake/SociBackend.cmake +++ b/src/cmake/SociBackend.cmake @@ -305,7 +305,7 @@ macro(soci_backend_test) target_link_libraries(${TEST_TARGET_STATIC} ${SOCI_CORE_TARGET_STATIC} - ${SOCI_${BACKENDU}_TARGET}-static + ${SOCI_${BACKENDU}_TARGET}_static ${${BACKENDU}_LIBRARIES} ${SOCI_CORE_STATIC_DEPENDENCIES} ${SOCI_TEST_DEPENDENCIES}) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e3929aa51..86ba1c1fa 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -135,4 +135,7 @@ soci_report_directory_property(COMPILE_DEFINITIONS) # Export core target name to make it visible by backends set(SOCI_CORE_TARGET ${SOCI_CORE_TARGET} PARENT_SCOPE) +if (SOCI_STATIC) + set(SOCI_CORE_TARGET_STATIC ${SOCI_CORE_TARGET_STATIC} PARENT_SCOPE) +endif() set(SOCI_CORE_STATIC_DEPENDENCIES ${SOCI_CORE_DEPENDENCIES} PARENT_SCOPE)