mirror of https://github.com/microsoft/vcpkg.git
[dimcli] Add supports field instead of written in ci.baseline, disable testing, support osx (#22577)
* [dimcli] Add supports field instead of written in ci.baseline, disable testing * version * Fix build on Windows * version * fix build on osx Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
This commit is contained in:
parent
20f876042b
commit
c9cffa2245
|
|
@ -0,0 +1,39 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 509e634..8b5a30b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -392,7 +392,7 @@ if(MSVC)
|
||||
set(CMAKE_CXX_FLAGS "\
|
||||
/EHsc /GF /nologo /std:c++latest /utf-8 /W4 /WX \
|
||||
/Zc:inline /Zc:rvalueCast /Zc:strictStrings \
|
||||
- /Fa$(IntDir)")
|
||||
+ /Fa${CMAKE_SOURCE_DIR}/libs/dimcli")
|
||||
if(NOT MSVC_VERSION LESS 1910)
|
||||
# /permissive- // reject non-conforming backward compatibility-isms
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
|
||||
@@ -431,8 +431,8 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
|
||||
if(BUILD_COVERAGE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
|
||||
endif()
|
||||
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
|
||||
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z")
|
||||
else()
|
||||
@@ -533,7 +533,6 @@ endforeach()
|
||||
# test targets
|
||||
if(BUILD_TESTING)
|
||||
enable_testing()
|
||||
-endif()
|
||||
file(GLOB allnames tests/*)
|
||||
foreach(var ${allnames})
|
||||
if(IS_DIRECTORY "${var}")
|
||||
@@ -548,6 +547,7 @@ foreach(var ${allnames})
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
+endif()
|
||||
|
||||
# update deps file
|
||||
update_deps_file(${deps})
|
||||
|
|
@ -4,22 +4,25 @@ vcpkg_from_github(
|
|||
REF a4dbb4b1c8a3825fc304bbbad3438dbe1840feae # v5.0.2
|
||||
SHA512 25cc9002fd46856854545934f385d8578f207b1ce01802a172e49e008cdf1db0db11db7cefeef18258b99c13570af9193e83f5826613d8b0a118d7bae3f0d03f
|
||||
HEAD_REF master
|
||||
PATCHES fix-build.patch
|
||||
)
|
||||
|
||||
set(staticCrt OFF)
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL "static")
|
||||
set(staticCrt ON)
|
||||
endif()
|
||||
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" staticCrt)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DLINK_STATIC_RUNTIME:BOOL=${staticCrt}
|
||||
-DINSTALL_LIBS:BOOL=ON
|
||||
-DBUILD_PROJECT_NAME=dimcli
|
||||
-DBUILD_TESTING=OFF
|
||||
-DINSTALL_TOOLS=OFF
|
||||
-DINSTALL_TESTS=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
# Remove includes from ${CMAKE_INSTALL_PREFIX}/debug
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,14 @@
|
|||
{
|
||||
"name": "dimcli",
|
||||
"version-semver": "5.0.2",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "C++ command line parser toolkit",
|
||||
"homepage": "https://github.com/gknowles/dimcli"
|
||||
"homepage": "https://github.com/gknowles/dimcli",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -206,9 +206,6 @@ devicenameresolver:x64-linux=fail
|
|||
devicenameresolver:x64-osx=fail
|
||||
devicenameresolver:x64-uwp=fail
|
||||
devicenameresolver:x64-windows-static=fail
|
||||
dimcli:arm-uwp=fail
|
||||
dimcli:x64-osx=fail
|
||||
dimcli:x64-uwp=fail
|
||||
# legacy directxsdk which conflicts with dxsdk-d3dx
|
||||
directxsdk:x86-windows=skip
|
||||
directxsdk:x64-windows=skip
|
||||
|
|
|
|||
|
|
@ -1818,7 +1818,7 @@
|
|||
},
|
||||
"dimcli": {
|
||||
"baseline": "5.0.2",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"directx-headers": {
|
||||
"baseline": "1.4.9",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "5d3878991b69b5ed78b2d82c56c5d3a707e13eb0",
|
||||
"version-semver": "5.0.2",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "9901ca1f1a121a702d4fb4c73ad6a482adff6c3f",
|
||||
"version-semver": "5.0.2",
|
||||
|
|
|
|||
Loading…
Reference in New Issue