From 9bf1809e28b92a7f54e152c7bb1ff4f488084285 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 24 Feb 2018 02:27:48 -0800 Subject: [PATCH] [magnum-extras] Fix build without features --- ports/magnum-extras/CONTROL | 2 +- ports/magnum-extras/portfile.cmake | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL index 0e7fe0a6b..d0f9f32d0 100644 --- a/ports/magnum-extras/CONTROL +++ b/ports/magnum-extras/CONTROL @@ -1,5 +1,5 @@ Source: magnum-extras -Version: 2018.02-1 +Version: 2018.02-2 Build-Depends: magnum Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake index 9c0771c52..402c1aa1f 100644 --- a/ports/magnum-extras/portfile.cmake +++ b/ports/magnum-extras/portfile.cmake @@ -41,26 +41,30 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/MagnumExtras TARGET_PATH share/MagnumExtras) + # Messages to the user if("ui" IN_LIST FEATURES) message(WARNING "It is recommended to install one of magnum-plugins[freetypefont,harfbuzzfont,stbtruetypefont] to have the UI library working out of the box") endif() + # Debug includes and share are the same as release file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) # Clean up empty directories -if(NOT FEATURES) +if("${FEATURES}" STREQUAL "") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug) + ${CURRENT_PACKAGES_DIR}/debug + ) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) endif()