From d931d74c11e3052c1396e3a7fa384fb02a7bdd20 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 8 Jan 2019 15:35:20 -0800 Subject: [PATCH] [wxwidgets] Disable cotire on OSX due to appleclang --- ports/wxwidgets/CONTROL | 2 +- ports/wxwidgets/portfile.cmake | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index c833a3e4a5..b922c1a24f 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.2 +Version: 3.1.2-1 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 75663fb9af..7319f9749b 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -8,6 +8,11 @@ vcpkg_from_github( PATCHES disable-platform-lib-dir.patch ) +set(OPTIONS) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -20,10 +25,13 @@ vcpkg_configure_cmake( -DwxUSE_LIBTIFF=sys -DwxUSE_STL=ON -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON + ${OPTIONS} ) vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)