diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-17 22:48:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 22:48:45 -0800 |
| commit | 115bff5c07da30d3aef616ebea17a68fda0e5dbc (patch) | |
| tree | d4e2926d6c8d1b946872430cb1e3f538997babd7 | |
| parent | f563d2b58849d8ae6a04be0ad531cb2e20313fe0 (diff) | |
| parent | 9fadc83fdcf2f46d0d9606f928a9487553823d3e (diff) | |
| download | vcpkg-115bff5c07da30d3aef616ebea17a68fda0e5dbc.tar.gz vcpkg-115bff5c07da30d3aef616ebea17a68fda0e5dbc.zip | |
Merge pull request #2530 from b-r-o-c-k/libodb-sqlite-fix
[libodb-sqlite] Allow static linking to libodb
| -rw-r--r-- | ports/libodb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libodb/portfile.cmake | 9 |
2 files changed, 10 insertions, 1 deletions
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 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() |