From 52390cf481f6fe3962bbbd2b84a62ab4d9702484 Mon Sep 17 00:00:00 2001
From: Marco Craveiro <mcraveiro@users.noreply.github.com>
Date: Fri, 1 Feb 2019 20:25:28 +0000
Subject: [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
---
 ports/libodb-pgsql/CMakeLists.txt   |  3 +++
 ports/libodb-pgsql/config.unix.h.in | 14 ++++++++++++++
 ports/libodb-pgsql/portfile.cmake   |  6 +++++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 ports/libodb-pgsql/config.unix.h.in

(limited to 'ports/libodb-pgsql')

diff --git a/ports/libodb-pgsql/CMakeLists.txt b/ports/libodb-pgsql/CMakeLists.txt
index cb510e805..46137ab57 100644
--- a/ports/libodb-pgsql/CMakeLists.txt
+++ b/ports/libodb-pgsql/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 project(libodb-pgsql VERSION 2.4.0 LANGUAGES CXX)
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
 find_package(PostgreSQL REQUIRED)
+configure_file(config.unix.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/odb/pgsql/details/config.h COPYONLY)
+
 set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)")
 file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/ports/libodb-pgsql/config.unix.h.in b/ports/libodb-pgsql/config.unix.h.in
new file mode 100644
index 000000000..cdced9eb0
--- /dev/null
+++ b/ports/libodb-pgsql/config.unix.h.in
@@ -0,0 +1,14 @@
+/* odb/pgsql/details/config.h.  Generated from config.h.in by configure.  */
+/* file      : odb/pgsql/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_PGSQL_DETAILS_CONFIG_H
+#define ODB_PGSQL_DETAILS_CONFIG_H
+
+/* #undef LIBODB_PGSQL_STATIC_LIB */
+
+#endif /* ODB_PGSQL_DETAILS_CONFIG_H */
diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake
index 752f98b70..cef945c73 100644
--- a/ports/libodb-pgsql/portfile.cmake
+++ b/ports/libodb-pgsql/portfile.cmake
@@ -7,7 +7,11 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-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})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG
-- 
cgit v1.2.3