The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 19:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1110 from sonogi1/dev

Browse Source 
[GDCM2] Update to 2.6.8
This commit is contained in:
Robert Schumacher 2017-05-17 05:36:24 -07:00 committed by GitHub
commit e215291013
4 changed files with 38 additions and 19 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 Source: gdcm2
Version: 2.6.7 Version: 2.6.8
Description: Grassroots DICOM library Description: Grassroots DICOM library
Build-Depends: zlib, expat Build-Depends: zlib, expat

10
ports/gdcm2/gdcm-include-dir.patch
View File

@ -1,10 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -409,6 +409,7 @@
if(GDCM_USE_SYSTEM_ZLIB)
# If user say so, then this is a requirement !
find_package(ZLIB REQUIRED)
+ include_directories(${ZLIB_INCLUDE_DIR})
set(GDCM_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
else()
set(GDCM_ZLIB_LIBRARIES "gdcmzlib")

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

@ -0,0 +1,11 @@
--- 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

34
ports/gdcm2/portfile.cmake
View File

@ -1,26 +1,44 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gdcm-2.6.7) vcpkg_from_github(
vcpkg_download_distfile(ARCHIVE OUT_SOURCE_PATH SOURCE_PATH
URLS "https://downloads.sourceforge.net/project/gdcm/gdcm 2.x/GDCM 2.6.7/gdcm-2.6.7.tar.gz" REPO malaterre/GDCM
FILENAME "gdcm-2.6.7.tar.gz" REF v2.6.8
SHA512 2eefad47e4d36038db8d120a91dc0a40816d045e3562c711b6dba7aec5788d4b08a00966bf4c82dc354cb1aa654bff4200afff022a42f2ab58bf7baafe69ff05 SHA512 f3b571f7e00b42b444acd6d696ba1979b6ef83e84744ecddb05ad09d8d2443027145c50cb67c6bc25d6b8e009833b643e575ab988106cb981f529cf455a9b0bc
HEAD_REF master
) )
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/gdcm-include-dir.patch" PATCHES
${CMAKE_CURRENT_LIST_DIR}/gdcmSystem.patch
) )
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(GDCM_BUILD_SHARED_LIBS ON) set(GDCM_BUILD_SHARED_LIBS ON)
else() else()
set(GDCM_BUILD_SHARED_LIBS OFF) set(GDCM_BUILD_SHARED_LIBS OFF)
endif() endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
# PREFER_NINJA # Disable this option if project cannot be built with Ninja PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS OPTIONS
-DGDCM_BUILD_DOCBOOK_MANPAGES=OFF -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
-DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS} -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
-DGDCM_INSTALL_INCLUDE_DIR=include
-DGDCM_USE_SYSTEM_EXPAT=ON -DGDCM_USE_SYSTEM_EXPAT=ON
-DGDCM_USE_SYSTEM_ZLIB=ON -DGDCM_USE_SYSTEM_ZLIB=ON
${ADDITIONAL_OPTIONS} ${ADDITIONAL_OPTIONS}