mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 03:22:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update GDCM

Browse Source
This commit is contained in:
Shinya Onogi 2017-10-21 19:28:27 +09:00
parent 7fb0342b8a
commit c37124be63
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/gdcm2/CONTROL
View File

@ -1,4 +1,4 @@
Source: gdcm2
Version: 2.6.8-1
Version: 2.8.3
Description: Grassroots DICOM library
Build-Depends: zlib, expat

11
ports/gdcm2/gdcmSystem.patch
View File

@ -1,11 +0,0 @@
--- a/Source/Common/gdcmSystem.cxx
+++ b/Source/Common/gdcmSystem.cxx
@@ -977,7 +977,7 @@
}
}
// We need to tell the user...
- gdcmWarningMacro( "Could not find Charset from alias: " + alias );
+ gdcmWarningMacro( std::string("Could not find Charset from alias: ") + alias );
return NULL;
}
#endif //_WIN32

7
ports/gdcm2/portfile.cmake
View File

@ -14,15 +14,14 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO malaterre/GDCM
REF v2.6.8
SHA512 f3b571f7e00b42b444acd6d696ba1979b6ef83e84744ecddb05ad09d8d2443027145c50cb67c6bc25d6b8e009833b643e575ab988106cb981f529cf455a9b0bc
HEAD_REF master
REF v2.8.3
SHA512 f8c3d600f067c9b60a32ff5fb7e751c06088e1e4a8e8d0f5e25d9fc7d49e8fab1f0242b10433f522d2043777cddace78c5a9c2cb25bac75a8e84fee554370f62
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/gdcmSystem.patch
${CMAKE_CURRENT_LIST_DIR}/socketxx.patch
)

11
ports/gdcm2/socketxx.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Utilities/socketxx/socket++/CMakeLists.txt
+++ b/Utilities/socketxx/socket++/CMakeLists.txt
@@ -76,7 +76,7 @@
endif()
set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES ${SOCKETXX_LIBRARY_PROPERTIES})
if(BUILD_SHARED_LIBS)
- set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES INTERFACE_LINK_LIBRARIES "" LINK_INTERFACE_LIBRARIES "")
+ set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES INTERFACE_LINK_LIBRARIES "")
endif()
# Install library