From 52d71092193952cc5859e56c7bb0990b5d4e5d00 Mon Sep 17 00:00:00 2001 From: Alvin <52727318+AlvinZhangH@users.noreply.github.com> Date: Sat, 21 Dec 2019 03:57:49 +0800 Subject: [PATCH] [simpleini] Fix build failure on travis CI (#9330) * [simpleini] Fix build failure on travis CI * [simpleini] x64-linux passing, remove from ci.baseline.txt * [simpleini] x64-osx passing, remove from ci.baseline.txt --- ports/simpleini/CONTROL | 2 +- ports/simpleini/portfile.cmake | 6 ++---- scripts/ci.baseline.txt | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ports/simpleini/CONTROL b/ports/simpleini/CONTROL index 589928579..d6a2c2a0b 100644 --- a/ports/simpleini/CONTROL +++ b/ports/simpleini/CONTROL @@ -1,3 +1,3 @@ Source: simpleini -Version: 2018-08-31-2 +Version: 2018-08-31-3 Description: Cross-platform C++ library providing a simple API to read and write INI-style configuration files diff --git a/ports/simpleini/portfile.cmake b/ports/simpleini/portfile.cmake index 806729908..e8060adad 100644 --- a/ports/simpleini/portfile.cmake +++ b/ports/simpleini/portfile.cmake @@ -1,6 +1,4 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brofield/simpleini @@ -9,6 +7,6 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${SOURCE_PATH}/Simpleini.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/SimpleIni.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/LICENCE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/simpleini RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENCE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fcc77fbea..466130d7e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1539,8 +1539,6 @@ shogun:x86-windows = skip simdjson:arm64-windows=fail simdjson:arm-uwp=fail simdjson:x86-windows=fail -simpleini:x64-linux=fail -simpleini:x64-osx=fail slikenet:arm-uwp=fail slikenet:x64-uwp=fail smpeg2:arm-uwp=fail