From 65bebab2a7b46e026c392e99a42a18335bfbf544 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 7 Oct 2020 05:51:09 +0800 Subject: [fuzzylite] Fix the headers to import the library with dynamic linkage (#13807) --- ports/fuzzylite/CONTROL | 3 ++- ports/fuzzylite/portfile.cmake | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ports/fuzzylite/CONTROL b/ports/fuzzylite/CONTROL index 4749c1423..f7376d258 100644 --- a/ports/fuzzylite/CONTROL +++ b/ports/fuzzylite/CONTROL @@ -1,4 +1,5 @@ Source: fuzzylite -Version: 6.0-2 +Version: 6.0 +Port-Version: 3 Homepage: https://github.com/fuzzylite/fuzzylite Description: A fuzzy logic control library in C++ diff --git a/ports/fuzzylite/portfile.cmake b/ports/fuzzylite/portfile.cmake index c4b70a72f..cd79ecc7c 100644 --- a/ports/fuzzylite/portfile.cmake +++ b/ports/fuzzylite/portfile.cmake @@ -1,9 +1,3 @@ -include(vcpkg_common_functions) - -if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fuzzylite/fuzzylite @@ -42,4 +36,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-static-debug.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-debug.lib) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fuzzylite RENAME copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h + "#elif defined(FL_IMPORT_LIBRARY)" + "#elif 1" + ) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -- cgit v1.2.3