3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[fuzzylite] Fix Linux build (#23658)

Browse Source 
* [fuzzylite] fix unix build

* update version scheme

* version

* unsupported on UWP

* remove from CI baseline

* version

* fix typo

* version

* windows only

* version

* Add fuzzylite:x64-osx

* Fix typo

* cr

* version

* Fix string replace on static

* version

* Don't rename artifacts

* version
This commit is contained in:
Thomas1664 2022-03-25 20:18:21 +01:00 committed by GitHub
parent ea5c1a6e5d
commit e29f8ab7b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ports/fuzzylite/portfile.cmake
View File

@ -6,17 +6,11 @@ vcpkg_from_github(
HEAD_REF master
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(FL_BUILD_SHARED ON)
set(FL_BUILD_STATIC OFF)
else()
set(FL_BUILD_SHARED OFF)
set(FL_BUILD_STATIC ON)
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FL_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FL_BUILD_SHARED)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/fuzzylite
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/fuzzylite"
OPTIONS
-DFL_BUILD_SHARED=${FL_BUILD_SHARED}
-DFL_BUILD_STATIC=${FL_BUILD_STATIC}
@ -24,23 +18,23 @@ vcpkg_configure_cmake(
-DFL_BUILD_TESTS=OFF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fuzzylite-static.lib ${CURRENT_PACKAGES_DIR}/lib/fuzzylite.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-static-debug.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-debug.lib)
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h"
"#elif defined(FL_IMPORT_LIBRARY)"
"#elif 1"
)
elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h"
"#elif defined(FL_IMPORT_LIBRARY)"
"#elif 0"
)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

14
ports/fuzzylite/vcpkg.json
View File

@ -1,7 +1,15 @@
{
"name": "fuzzylite",
"version-string": "6.0",
"port-version": 4,
"version": "6.0",
"port-version": 5,
"description": "A fuzzy logic control library in C++",
"homepage": "https://github.com/fuzzylite/fuzzylite"
"homepage": "https://github.com/fuzzylite/fuzzylite",
"license": "GPL-3.0",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}

3
scripts/ci.baseline.txt
View File

@ -310,10 +310,7 @@ freetype-gl:x64-uwp=fail
ftgl:x64-uwp=fail
# https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207
functions-framework-cpp:x64-uwp=fail
fuzzylite:arm-uwp=fail
fuzzylite:x64-linux=fail
fuzzylite:x64-osx=fail
fuzzylite:x64-uwp=fail
# gsoap does not offer stable public source downloads
gsoap:x64-windows = skip

2
versions/baseline.json
View File

@ -2358,7 +2358,7 @@
},
"fuzzylite": {
"baseline": "6.0",
"port-version": 4
"port-version": 5
},
"fxdiv": {
"baseline": "2021-02-21",

5
versions/f-/fuzzylite.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "27926f33e6bab79f1eefa5c7999645f855c5fda3",
"version": "6.0",
"port-version": 5
},
{
"git-tree": "df47396ca528792e73f67bb8f297a064b46ef21b",
"version-string": "6.0",