From 124a9354c03a90ffdfe93570fad016f0e90be23b Mon Sep 17 00:00:00 2001 From: b-r-o-c-k Date: Tue, 9 Jan 2018 20:52:59 -0600 Subject: [libodb] Allow static linking to libodb --- ports/libodb/portfile.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 21d715499..e45b7b25a 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -36,4 +36,13 @@ write_basic_package_version_file(${CURRENT_PACKAGES_DIR}/share/odb/odbConfigVers file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) +set(LIBODB_HEADER_PATH ${CURRENT_PACKAGES_DIR}/include/odb/details/export.hxx) +file(READ ${LIBODB_HEADER_PATH} LIBODB_HEADER) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 1" LIBODB_HEADER ${LIBODB_HEADER}) +else() + string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 0" LIBODB_HEADER ${LIBODB_HEADER}) +endif() +file(WRITE ${LIBODB_HEADER_PATH} ${LIBODB_HEADER}) + vcpkg_copy_pdbs() -- cgit v1.2.3 From 9fadc83fdcf2f46d0d9606f928a9487553823d3e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 17 Jan 2018 22:48:10 -0800 Subject: [libodb] Bump version due to package change --- ports/libodb/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libodb/CONTROL b/ports/libodb/CONTROL index 3d502effe..bb9bbfe29 100644 --- a/ports/libodb/CONTROL +++ b/ports/libodb/CONTROL @@ -1,3 +1,3 @@ Source: libodb -Version: 2.4.0-1 +Version: 2.4.0-2 Description: ODB library, base runtime for the ODB ORM solution -- cgit v1.2.3