Export SOCI_CORE_TARGET_STATIC to parent scope

Rename left over old name -static to _static
SOCI · Feb 28, 2013 · 0691e60 · 0691e60
1 parent 84d065a
commit 0691e60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)