diff options
| author | Glen Knowles <gknowles@ieee.org> | 2018-10-25 15:27:36 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-25 15:27:36 -0700 |
| commit | 8174938d508e052f20fc0fb0e2d258a21d9f1d84 (patch) | |
| tree | a1db5da357f3f4d39d9fa3c83bd6cc71c1bcb0b4 | |
| parent | aba5a4abecd56b90f8f3568edb62db8c3344cb8e (diff) | |
| download | vcpkg-8174938d508e052f20fc0fb0e2d258a21d9f1d84.tar.gz vcpkg-8174938d508e052f20fc0fb0e2d258a21d9f1d84.zip | |
[dimcli] Update to 4.0.1 (#4549)
* [dimcli] update to 3.1.1
* [dimcli] Update to 4.0.1
* [dimcli] Remove quotes around project name
| -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..b1526996e 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,3 +1,3 @@ Source: dimcli -Version: 3.1.1-2 +Version: 4.0.1-1 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..f66120c5e 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.0.1 + SHA512 e36008eed42997c467ef7f4780cacd7eb8acebeb48be56445914c0ae125c5dbf29a172e1fb2f9490a6f21db8f6de5fa0420f499aff996ee148ec3a5bef0adba5 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() |