diff options
| author | Marco Craveiro <mcraveiro@users.noreply.github.com> | 2019-02-01 20:25:28 +0000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-02-01 12:25:28 -0800 |
| commit | 52390cf481f6fe3962bbbd2b84a62ab4d9702484 (patch) | |
| tree | f52f1f6259b2762ab8d2dcbe771e606999db560f /ports/libodb-mysql | |
| parent | 9be25c17aaf1fc9a1cf2c86a9225879f5ee45f57 (diff) | |
| download | vcpkg-52390cf481f6fe3962bbbd2b84a62ab4d9702484.tar.gz vcpkg-52390cf481f6fe3962bbbd2b84a62ab4d9702484.zip | |
[libodb] Assorted fixes to get ODB v2.4 libraries to compile on x64 Linux (#5260)
* [libodb] Add configure headers to all libs for Linux
* [libodb] Include options files in install
Diffstat (limited to 'ports/libodb-mysql')
| -rw-r--r-- | ports/libodb-mysql/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/libodb-mysql/config.unix.h.in | 19 | ||||
| -rw-r--r-- | ports/libodb-mysql/portfile.cmake | 8 |
3 files changed, 28 insertions, 2 deletions
diff --git a/ports/libodb-mysql/CMakeLists.txt b/ports/libodb-mysql/CMakeLists.txt index b578964b6..fe02585b1 100644 --- a/ports/libodb-mysql/CMakeLists.txt +++ b/ports/libodb-mysql/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.0) project(libodb-mysql VERSION 2.4.0 LANGUAGES CXX) find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/mysql/details/config.h COPYONLY) + INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") file(GLOB_RECURSE libodb_src diff --git a/ports/libodb-mysql/config.unix.h.in b/ports/libodb-mysql/config.unix.h.in new file mode 100644 index 000000000..b1270e20e --- /dev/null +++ b/ports/libodb-mysql/config.unix.h.in @@ -0,0 +1,19 @@ +/* odb/mysql/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/mysql/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_MYSQL_DETAILS_CONFIG_H +#define ODB_MYSQL_DETAILS_CONFIG_H + +/* #undef LIBODB_MYSQL_STATIC_LIB */ + +/* #undef LIBODB_MYSQL_INCLUDE_SHORT */ +#define LIBODB_MYSQL_INCLUDE_LONG 1 + +/* #undef LIBODB_MYSQL_THR_KEY_VISIBLE */ + +#endif /* ODB_MYSQL_DETAILS_CONFIG_H */ diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index e6f1e2441..88684bd35 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -25,7 +25,11 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/adapter_mysql_8.0.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib") set(MYSQL_LIB_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib") @@ -48,4 +52,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_mysqlConfig-debug.cmake "${LIBO file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-mysql) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-mysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-mysql/copyright) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() |