Commit 042dc0fd authored by VZ's avatar VZ Committed by GitHub

Merge pull request #570 from mcencora/master

Add cmake support for build in superprojects.

Also fix sanitizer warnings in type-conversion.h and clean it up by removing
unnecessary namespace qualifiers.
parents 8fdb2e7e 9d82ee8e
This diff is collapsed.
......@@ -60,6 +60,12 @@ if (SOCI_SHARED)
INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib
CLEAN_DIRECT_OUTPUT 1)
endif()
target_include_directories(${SOCI_CORE_TARGET}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
)
endif()
# This adds definitions to all build configurations. SOCI_DEBUG_POSTFIX is passed to soci library
......@@ -86,8 +92,17 @@ if (SOCI_STATIC)
OUTPUT_NAME ${SOCI_CORE_TARGET_OUTPUT_NAME}
PREFIX "lib"
CLEAN_DIRECT_OUTPUT 1)
target_include_directories(${SOCI_CORE_TARGET_STATIC}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
)
endif()
#
# Core installation
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment