diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
| commit | 773c8267dfb506f41c204f61042f30b6143a8095 (patch) | |
| tree | 5946d1526c3ad77a2df80786a1370d96389d931b /ports/dimcli | |
| parent | 6afbceb27fd2aa39c66f810a22f5d4ad97575110 (diff) | |
| parent | 7859944528be28bee1fda9f325b78d6a7f02124e (diff) | |
| download | vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.tar.gz vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564
Diffstat (limited to 'ports/dimcli')
| -rw-r--r-- | ports/dimcli/CONTROL | 2 | ||||
| -rw-r--r-- | ports/dimcli/fix-cmake.patch | 23 | ||||
| -rw-r--r-- | ports/dimcli/portfile.cmake | 12 |
3 files changed, 4 insertions, 33 deletions
diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index 96943086c..e9d17c122 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,3 +1,3 @@ Source: dimcli -Version: 3.1.1-2 +Version: 4.1.0 Description: C++ command line parser toolkit diff --git a/ports/dimcli/fix-cmake.patch b/ports/dimcli/fix-cmake.patch deleted file mode 100644 index 63795e041..000000000 --- a/ports/dimcli/fix-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f319ee..a38eca2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -264,7 +264,7 @@ endfunction()
- # "-1.2.3" from the that vcpkg likes to add when building things.
- get_filename_component(prjname "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
- string(REGEX REPLACE "(-[\.0-9\-]*)$" "" prjname ${prjname})
--project(${prjname})
-+project(dimcli)
- string(TOUPPER "${prjname}" DEFINE_PREFIX)
-
- get_property(parent DIRECTORY PROPERTY PARENT_DIRECTORY)
-@@ -323,9 +323,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER cmake)
-
- set(CMAKE_CONFIGURATION_TYPES Debug Release)
--set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
--set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/bin)
--set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/bin)
-
- if(MSVC)
- # "/EHsc" - exceptions from c++ only (not from structured or "C")
diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index f1cb2f4ec..6362aa987 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -3,27 +3,21 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gknowles/dimcli - REF v3.1.1 - SHA512 ed9aeedc59a9d48c59aa8dd1adb9cb110771c1eab0bbab8f8b518e12a45cdafb0ea94301d082ed3a033ca2428c19c8d990c76f666d1e9822cddf6e744f1db701 + REF v4.1.0 + SHA512 5de010b5abfda9e6996bba8c621e03ae0cf81dbc2f69cd859e2ebf7b1706c451f7f8e142299784646d89ca3c3e5803e8711215680b8bdb8eb663158bff3b4f3d HEAD_REF master - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/fix-cmake.patch" ) set(staticCrt OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") set(staticCrt ON) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(ENV{_CL_} "/DDIMCLI_LIB_DYN_LINK") -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} -DINSTALL_LIBS:BOOL=ON - -DRECURSIVE_GENERATE=ON + -DBUILD_PROJECT_NAME=dimcli ) vcpkg_install_cmake() |