universal builds

Author: hannes

CMakeLists.txt

@@ -24,6 +24,19 @@ endif()
 
 project(postgres_scanner C CXX)
 
+option(
+  OSX_BUILD_UNIVERSAL
+  "Build both architectures on OSX and create a single binary containing both."
+  FALSE)
+if(OSX_BUILD_UNIVERSAL)
+  if(NOT APPLE)
+    error("This only makes sense on OSX")
+  endif()
+  set(CMAKE_OSX_ARCHITECTURES
+      "x86_64;arm64"
+      CACHE STRING "Build architectures for Mac OS X" FORCE)
+endif()
+
 find_package(Threads REQUIRED)
 add_subdirectory(postgres)
 
@@ -32,8 +45,7 @@ if(WIN32 AND NOT MSVC)
   return()
 endif()
 
-include_directories(duckdb/src/include)
-include_directories(duckdb/third_party/fmt/include)
+include_directories(${DUCKDB_INCLUDE_FOLDER})
 
 include_directories(postgres/postgres/src/include)
 include_directories(postgres/postgres/src/interfaces/libpq)
@@ -46,16 +58,10 @@ endif()
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   add_compile_options(-Wall -pedantic -fsanitize=address -fno-sanitize=vptr)
-  link_directories(duckdb/build/debug/src)
-else()
-  if(WIN32)
-    link_directories(duckdb/build/release/src/Release)
-  else()
-    link_directories(duckdb/build/release/src)
-
-  endif()
 endif()
 
+link_directories(${DUCKDB_LIBRARY_FOLDER})
+
 add_library(postgres_scanner SHARED postgres_scanner.cpp)
 set_target_properties(postgres_scanner PROPERTIES PREFIX "")
 target_link_libraries(postgres_scanner duckdb duckdb_libpq Threads::Threads)

Makefile

@@ -1,6 +1,13 @@
 .PHONY: all clean format debug release duckdb_debug duckdb_release update
 all: release
 GEN=ninja
+
+OSX_BUILD_UNIVERSAL_FLAG=
+ifeq (${OSX_BUILD_UNIVERSAL}, 1)
+	OSX_BUILD_UNIVERSAL_FLAG=-DOSX_BUILD_UNIVERSAL=1
+endif
+
+
 clean:
 	rm -rf build
 	rm -rf duckdb/build
@@ -20,13 +27,13 @@ duckdb_release:
 debug: postgres/postgres duckdb_debug
 	mkdir -p build/debug && \
 	cd build/debug && \
-	cmake  -DCMAKE_BUILD_TYPE=Debug ../.. && \
+	cmake -DCMAKE_BUILD_TYPE=Debug -DDUCKDB_INCLUDE_FOLDER=duckdb/src/include -DDUCKDB_LIBRARY_FOLDER=duckdb/build/debug/src ${OSX_BUILD_UNIVERSAL_FLAG} ../.. && \
 	cmake --build .
 
 release: postgres/postgres duckdb_release
 	mkdir -p build/release && \
 	cd build/release && \
-	cmake  -DCMAKE_BUILD_TYPE=RelWithDebInfo ../.. && \
+	cmake  -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDUCKDB_INCLUDE_FOLDER=duckdb/src/include -DDUCKDB_LIBRARY_FOLDER=duckdb/build/release/src ${OSX_BUILD_UNIVERSAL_FLAG} ../.. && \
 	cmake --build .
 
 test: release

postgres/configure

@@ -3,25 +3,26 @@ rm -rf postgres
 mkdir postgres
 curl -s -L https://github.com/postgres/postgres/archive/refs/tags/REL_14_2.tar.gz | tar xz --strip-components 1 -C postgres
 
-(cd postgres && ./configure \
-  --without-llvm        \
-  --without-icu         \
-  --without-tcl         \
-  --without-perl        \
-  --without-python      \
-  --without-gssapi      \
-  --without-pam         \
-  --without-bsd-auth    \
-  --without-ldap        \
-  --without-bonjour     \
-  --without-selinux     \
-  --without-systemd     \
-  --without-readline    \
-  --without-libxml      \
-  --without-libxslt     \
-  --without-zlib        \
-  --without-lz4         \
-  --without-openssl  > /dev/null)
-
-# TODO windows
-# (cd postgres/src/tools/msvc/ && perl mkvcbuild.pl)
+if [ "$OS" = "Windows_NT" ]; then
+  (cd postgres/src/tools/msvc/ && perl mkvcbuild.pl)
+else
+  (cd postgres && ./configure \
+    --without-llvm        \
+    --without-icu         \
+    --without-tcl         \
+    --without-perl        \
+    --without-python      \
+    --without-gssapi      \
+    --without-pam         \
+    --without-bsd-auth    \
+    --without-ldap        \
+    --without-bonjour     \
+    --without-selinux     \
+    --without-systemd     \
+    --without-readline    \
+    --without-libxml      \
+    --without-libxslt     \
+    --without-zlib        \
+    --without-lz4         \
+    --without-openssl  > /dev/null)
+fi