From 9bfd9a31823b06ec6c0950eff6b7f42c296e3619 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Thu, 12 Dec 2019 14:27:00 +0100 Subject: [PATCH] update libffi to 3.3 and fix a compilation problem --- CMakeLists.txt | 10 ++++++++-- osx.cmake | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95bac94..ea20853 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,8 +73,14 @@ ExternalProject_Add(build_libFFI UPDATE_COMMAND "" GIT_REPOSITORY "https://github.com/libffi/libffi.git" - GIT_TAG "v3.3-rc0" - CONFIGURE_COMMAND "./autogen.sh" COMMAND ./configure "--target=${LIBFFI_TARGET}" "--disable-docs" "--prefix=${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install" "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_C_COMPILER}" + GIT_TAG "v3.3" + CONFIGURE_COMMAND "./autogen.sh" COMMAND ./configure + "--target=${LIBFFI_TARGET}" + "--disable-docs" + "--prefix=${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install" + "${LIBFFI_EXTRA_PARAMETERS}" + "CC=${CMAKE_C_COMPILER}" + "CXX=${CMAKE_C_COMPILER}" ) if(OSX) diff --git a/osx.cmake b/osx.cmake index a9b2536..8fe16fa 100644 --- a/osx.cmake +++ b/osx.cmake @@ -8,3 +8,5 @@ set(TEST_LIBRARY_DLL libTestLibrary.dylib) set(DYLIB_EXT "*.dylib") +# In Esteban's machine this is needed. Maybe for all? +set(LIBFFI_EXTRA_PARAMETERS "CFLAGS=-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include") \ No newline at end of file