diff options
| author | winsoft666 <46803815+winsoft666@users.noreply.github.com> | 2020-01-15 04:25:32 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-14 12:25:32 -0800 |
| commit | a982079028f49c4a3464085f292eb6edf44ccec3 (patch) | |
| tree | 23a8eb03edc354ef952c8c2fc063517c514dde40 | |
| parent | d73e5209e89308a61d4e08547db48b3ccfb6e8bd (diff) | |
| download | vcpkg-a982079028f49c4a3464085f292eb6edf44ccec3.tar.gz vcpkg-a982079028f49c4a3464085f292eb6edf44ccec3.zip | |
[akali] Update to v1.41 (#9617)
* Add: set(VCPKG_PLATFORM_TOOLSET v140)
* add ppxbase and ppxnet.
* nice, ppxbase and ppxnet can install successful.
* update to v1.7
* + add duilib2
- update ppxbase, ppxnet.
* set VCPKG_PLATFORM_TOOLSET to vc141.
duilib2/ppxbase/ppxnet port.
* library version.
* duilib2, ppxbase version.
* duilib2 version
* update duilib2/ppxbase version.
* update duilib2 code version.
* update ppxbase version.
update duilib2 version.
* update ppxbase/duilib2 cmake config.
* duilib2 version.
* ppxbase version.
* + add akali library.
* update ports script.
* ports update.
* add akali
* remove duilib2/ppxnet
* revert
* update akali version.
* update akali version.
* Update portfile.cmake
* Update portfile.cmake
* [akali] Update to v1.41
* Update portfile.cmake
* [akali] Update version.
* [akali] Remove the line akali:x64-osx=fail from /scripts/ci.baseline.txt
| -rw-r--r-- | ports/akali/CONTROL | 2 | ||||
| -rw-r--r-- | ports/akali/portfile.cmake | 19 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
3 files changed, 16 insertions, 6 deletions
diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL index 2aa6b0d6c..a7acd5919 100644 --- a/ports/akali/CONTROL +++ b/ports/akali/CONTROL @@ -1,4 +1,4 @@ Source: akali -Version: 1.39 +Version: 1.41 Description: C++ Common Library. Homepage: https://github.com/winsoft666/akali
\ No newline at end of file diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 1c87179f8..e1be35018 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,20 +1,23 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF 07d855dd2da7cddb374646465799734e48e0adb2 - SHA512 4298bc97c5b99494f517e46a86a30dcd61e9d4cfdfa5dbb4c17957c8e866de8ed5b41b2f9a17261f96fc3c7b25fbac2003af4ad8ca675d3f59ce6176e1112220 + REF aa0ee3b82cef325ca582fce30bf3bf177ed81e9b + SHA512 0d523191219b19bcf2becb2c9e78b32b50fbbd5a052dd5330e315a6310c0d5c322639434f710a37c6d98e23510506d294b52978f8487227d4461d29d4a6bb502 HEAD_REF master ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DAKALI_STATIC:BOOL=${AKALI_STATIC} -DBUILD_TESTS:BOOL=OFF ) -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_install_cmake() if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali) @@ -23,6 +26,14 @@ elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) endif() +file(READ ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h AKALI_EXPORT_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}") +else() + string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h "${AKALI_EXPORT_H}") + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 64969ecb5..7ad3e9c87 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -54,7 +54,6 @@ activemq-cpp:x64-windows-static=fail akali:x64-uwp=fail
akali:arm-uwp=fail
akali:arm64-windows=fail
-akali:x64-osx=fail
alac:arm-uwp=fail
alac:x64-uwp=fail
alembic:x64-linux=fail
|