Skip to content

Commit 17fe16f

Browse files
LilyWangLLLilyWangLL
authored
Merge branch 'master' into dev/LilyWang/issue16019
2 parents 66a7f48 + d293ac2 commit 17fe16f

File tree

106 files changed

+1221
-333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1221
-333
lines changed

Diff for: ‎ports/bdwgc/portfile.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ vcpkg_cmake_configure(
1212
-Denable_cplusplus=ON
1313
-Denable_docs=OFF
1414
-DCFLAGS_EXTRA=-I${CURRENT_INSTALLED_DIR}/include # for libatomic_ops
15-
OPTIONS_DEBUG
16-
-Dinstall_headers=OFF
1715
)
1816

1917
vcpkg_cmake_install()
2018
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bdwgc)
2119
vcpkg_copy_pdbs()
2220

2321
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
22+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
2423

2524
vcpkg_fixup_pkgconfig()
2625

Diff for: ‎ports/bdwgc/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bdwgc",
33
"version": "8.2.0",
4-
"port-version": 3,
4+
"port-version": 4,
55
"description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)",
66
"homepage": "http://www.hboehm.info/gc/",
77
"dependencies": [

Diff for: ‎ports/boost-modular-build-helper/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le")
4040
list(APPEND B2_OPTIONS architecture=power)
4141
elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch")
4242
list(APPEND B2_OPTIONS architecture=loongarch)
43+
elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips64")
44+
list(APPEND B2_OPTIONS architecture=mips64)
4345
elseif("arm64" IN_LIST VCPKG_TARGET_ARCHITECTURE AND "x86_64" IN_LIST VCPKG_TARGET_ARCHITECTURE)
4446
list(APPEND B2_OPTIONS architecture=arm+x86)
4547
else()

Diff for: ‎ports/boost-modular-build-helper/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "boost-modular-build-helper",
33
"version": "1.79.0",
4-
"port-version": 7,
4+
"port-version": 8,
55
"description": "Internal vcpkg port used to build Boost libraries",
66
"license": "MIT",
77
"dependencies": [

Diff for: ‎ports/dcmtk/portfile.cmake

+100-13
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,127 @@
1-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
2-
31
vcpkg_from_github(
42
OUT_SOURCE_PATH SOURCE_PATH
53
REPO DCMTK/dcmtk
64
REF a137f1aff4e1df3fbefe53ee8b160973c74c96dd # DCMTK-3.6.7
75
SHA512 dd41b38ef5d02ac2bf4071e1c27814e03357bc6a51eef59daf47a86d024d7fcbaaa1a71df8600fb8180f8b6537d45d6bf48a00730c1fa9d147778f36ff3e425a
86
HEAD_REF master
9-
PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
7+
PATCHES
8+
dcmtk.patch
9+
windows-patch.patch
10+
)
11+
12+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
13+
FEATURES
14+
"iconv" DCMTK_WITH_ICONV
15+
"icu" DCMTK_WITH_ICU
16+
"openssl" DCMTK_WITH_OPENSSL
17+
"png" DCMTK_WITH_PNG
18+
"tiff" DCMTK_WITH_TIFF
19+
"xml2" DCMTK_WITH_XML
20+
"zlib" DCMTK_WITH_ZLIB
21+
"tools" BUILD_APPS
1022
)
1123

1224
vcpkg_cmake_configure(
1325
SOURCE_PATH "${SOURCE_PATH}"
1426
OPTIONS
27+
${FEATURE_OPTIONS}
1528
-DDCMTK_WITH_DOXYGEN=OFF
16-
-DDCMTK_WITH_ZLIB=OFF
17-
-DDCMTK_WITH_OPENSSL=OFF
18-
-DDCMTK_WITH_PNG=OFF
19-
-DDCMTK_WITH_TIFF=OFF
20-
-DDCMTK_WITH_XML=OFF
21-
-DDCMTK_WITH_ICONV=OFF
2229
-DDCMTK_FORCE_FPIC_ON_UNIX=ON
2330
-DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF
2431
-DDCMTK_ENABLE_PRIVATE_TAGS=ON
25-
-DBUILD_APPS=OFF
26-
-DDCMTK_ENABLE_CXX11=ON
32+
-DCMAKE_CXX_STANDARD=17
2733
-DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS=ON
2834
-DDCMTK_WIDE_CHAR_MAIN_FUNCTION=ON
35+
-DDCMTK_ENABLE_STL=ON
2936
-DCMAKE_DEBUG_POSTFIX=d
3037
OPTIONS_DEBUG
3138
-DINSTALL_HEADERS=OFF
3239
-DINSTALL_OTHER=OFF
40+
-DBUILD_APPS=OFF
3341
)
3442

3543
vcpkg_cmake_install()
3644
vcpkg_copy_pdbs()
3745

46+
if ("tools" IN_LIST FEATURES)
47+
set(_tools
48+
cda2dcm
49+
dcm2json
50+
dcm2pdf
51+
dcm2pnm
52+
dcm2xml
53+
dcmcjpeg
54+
dcmcjpls
55+
dcmconv
56+
dcmcrle
57+
dcmdata_tests
58+
dcmdjpeg
59+
dcmdjpls
60+
dcmdrle
61+
dcmdspfn
62+
dcmdump
63+
dcmect_tests
64+
dcmfg_tests
65+
dcmftest
66+
dcmgpdir
67+
dcmicmp
68+
dcmiod_tests
69+
dcmj2pnm
70+
dcml2pnm
71+
dcmmkcrv
72+
dcmmkdir
73+
dcmmklut
74+
dcmnet_tests
75+
dcmodify
76+
dcmp2pgm
77+
dcmprscp
78+
dcmprscu
79+
dcmpschk
80+
dcmpsmk
81+
dcmpsprt
82+
dcmpsrcv
83+
dcmpssnd
84+
dcmqridx
85+
dcmqrscp
86+
dcmqrti
87+
dcmquant
88+
dcmrecv
89+
dcmrt_tests
90+
dcmscale
91+
dcmseg_tests
92+
dcmsend
93+
dcmsign
94+
dcmsr_tests
95+
dcmtls_tests
96+
dcod2lum
97+
dconvlum
98+
drtdump
99+
drttest
100+
dsr2html
101+
dsr2xml
102+
dsrdump
103+
dump2dcm
104+
echoscu
105+
findscu
106+
getscu
107+
img2dcm
108+
mkreport
109+
movescu
110+
msgserv
111+
ofstd_tests
112+
pdf2dcm
113+
stl2dcm
114+
storescp
115+
storescu
116+
termscu
117+
wlmscpfs
118+
wltest
119+
xml2dcm
120+
xml2dsr
121+
)
122+
vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN)
123+
endif()
124+
38125
vcpkg_cmake_config_fixup()
39126

40127
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
@@ -46,5 +133,5 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "
46133
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "")
47134

48135
vcpkg_fixup_pkgconfig()
49-
# Handle copyright
50-
file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dcmtk" RENAME copyright)
136+
137+
file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

Diff for: ‎ports/dcmtk/vcpkg.json

+49-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "dcmtk",
33
"version": "3.6.7",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.",
66
"homepage": "https://github.com/DCMTK/dcmtk",
77
"license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng",
@@ -15,5 +15,52 @@
1515
"name": "vcpkg-cmake-config",
1616
"host": true
1717
}
18-
]
18+
],
19+
"features": {
20+
"iconv": {
21+
"description": "Enable Iconv support",
22+
"dependencies": [
23+
"libiconv"
24+
]
25+
},
26+
"icu": {
27+
"description": "Enable ICU support",
28+
"dependencies": [
29+
"icu"
30+
]
31+
},
32+
"openssl": {
33+
"description": "Enable OpenSSL",
34+
"dependencies": [
35+
"openssl"
36+
]
37+
},
38+
"png": {
39+
"description": "Enable PNG support",
40+
"dependencies": [
41+
"libpng"
42+
]
43+
},
44+
"tiff": {
45+
"description": "Enable TIFF support",
46+
"dependencies": [
47+
"tiff"
48+
]
49+
},
50+
"tools": {
51+
"description": "Build apps"
52+
},
53+
"xml2": {
54+
"description": "Enable XML support",
55+
"dependencies": [
56+
"libxml2"
57+
]
58+
},
59+
"zlib": {
60+
"description": "Enable zlib support",
61+
"dependencies": [
62+
"zlib"
63+
]
64+
}
65+
}
1966
}

Diff for: ‎ports/dcmtk/windows-patch.patch

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
2+
index 47e3476..2c974e8 100644
3+
--- a/CMake/3rdparty.cmake
4+
+++ b/CMake/3rdparty.cmake
5+
@@ -3,11 +3,7 @@ if(WIN32)
6+
# For Windows, we don't used FIND_PACKAGE because DCMTK usually is used with its
7+
# own set of 3rd-party support libraries that can be downloaded from DCMTK's
8+
# website (pre-built).
9+
- if(MINGW)
10+
- set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
11+
- else()
12+
- set(DCMTK_USE_FIND_PACKAGE FALSE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
13+
- endif()
14+
+ set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
15+
else()
16+
# Only find_package is supported
17+
set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
18+
diff --git a/CMakeLists.txt b/CMakeLists.txt
19+
index 9f8d268..28ddc3e 100644
20+
--- a/CMakeLists.txt
21+
+++ b/CMakeLists.txt
22+
@@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.0.0...3.13.2 FATAL_ERROR)
23+
# Declare project
24+
project(DCMTK)
25+
26+
+if(MSVC)
27+
+ string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
28+
+endif()
29+
+
30+
#-----------------------------------------------------------------------------
31+
# General project settings to configure DCMTK build process
32+
#-----------------------------------------------------------------------------

Diff for: ‎ports/dv-processing/portfile.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ vcpkg_from_gitlab(
22
GITLAB_URL https://gitlab.com/inivation
33
OUT_SOURCE_PATH SOURCE_PATH
44
REPO dv/dv-processing
5-
REF 96d082a862bb1e5bfdc79b39aa09e7a50c2dac49
6-
SHA512 cf74e8a6f94f690e159778b59eb2e4d9c8f51f09437e94a507a2ec8f42e167fe6d1413ba91ab608624a02b4b479b27f454e7b7792d125ce5a163f4aa98e774cc
5+
REF 6029bb4ecc06566b5f68375c68f00dfe78587baa
6+
SHA512 9d0928e6ded1dab147814f380c57fb5b2c467c213c1fd12dddad9982e7d6a94a7bef526fcd248dd672b4b84753a44599b10d7794640ec63027152cd33b675787
77
HEAD_REF rel_1.5
88
)
99

Diff for: ‎ports/dv-processing/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dv-processing",
3-
"version": "1.5.0",
3+
"version": "1.5.1",
44
"description": "Generic algorithms for event cameras.",
55
"homepage": "https://gitlab.com/inivation/dv/dv-processing",
66
"license": "Apache-2.0",

Diff for: ‎ports/fakeit/portfile.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO eranpeer/FakeIt
4-
REF 38c118c2be2fe33148545b1c32dc568eeabe1f23 #v2.1.1
5-
SHA512 32b91a1d2fc156cd2293774fea0196492356411ad2437acde1488e087a62f921e13dd75d850be3d50c380e3d525759273eba5b40771fe140581d5ffaefe16842
4+
REF 78ca536e6b32f11e2883d474719a447915e40005 #v2.3.0
5+
SHA512 b3a76d278217d177e2222d6e4c782c8ee08a7b6244e5f89fd25b22faffc8f0cf402c1d04763fb6f6ef37272738adf5dd7ff7a0437c1bc9a5043765058fa2a648
66
HEAD_REF master
77
)
88

Diff for: ‎ports/fakeit/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fakeit",
3-
"version": "2.1.1",
3+
"version": "2.3.0",
44
"description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.",
55
"homepage": "https://github.com/eranpeer/FakeIt",
66
"license": "MIT"

Diff for: ‎ports/gdal/dependency_win.cmake

+12-12
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ macro(find_dependency_win)
114114
if("hdf5" IN_LIST FEATURES)
115115
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR)
116116
x_vcpkg_pkgconfig_get_modules(PREFIX HDF5 MODULES --msvc-syntax hdf5 LIBS)
117-
list(APPEND NMAKE_OPTIONS "HDF5_DIR=${CURRENT_INSTALLED_DIR}" "HDF5_PLUGIN=NO")
117+
list(APPEND NMAKE_OPTIONS "HDF5_DIR=${HDF5_DIR}" "HDF5_PLUGIN=NO")
118118
list(APPEND NMAKE_OPTIONS_REL "HDF5_LIB=${HDF5_LIBS_RELEASE}")
119119
list(APPEND NMAKE_OPTIONS_DBG "HDF5_LIB=${HDF5_LIBS_DEBUG}")
120120
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -160,27 +160,27 @@ macro(find_dependency_win)
160160
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CRYPTOPP_INCLUDE)
161161
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_REL)
162162
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_DBG)
163-
list(APPEND NMAKE_OPTIONS CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE})
164-
list(APPEND NMAKE_OPTIONS_REL CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL})
165-
list(APPEND NMAKE_OPTIONS_DBG CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG})
163+
list(APPEND NMAKE_OPTIONS "CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE}")
164+
list(APPEND NMAKE_OPTIONS_REL "CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL}")
165+
list(APPEND NMAKE_OPTIONS_DBG "CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG}")
166166
endif()
167167

168168
# freexl
169169
if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/freexl.lib")
170170
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FREEXL_INCLUDE)
171171
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/freexl.lib" FREEXL_LIBRARY_REL)
172172
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib" FREEXL_LIBRARY_DBG)
173-
list(APPEND NMAKE_OPTIONS FREEXL_CFLAGS=-I${FREEXL_INCLUDE})
174-
list(APPEND NMAKE_OPTIONS_REL FREEXL_LIBS=${FREEXL_LIBRARY_REL})
175-
list(APPEND NMAKE_OPTIONS_DBG FREEXL_LIBS=${FREEXL_LIBRARY_DBG})
173+
list(APPEND NMAKE_OPTIONS "FREEXL_CFLAGS=-I${FREEXL_INCLUDE}")
174+
list(APPEND NMAKE_OPTIONS_REL "FREEXL_LIBS=${FREEXL_LIBRARY_REL}")
175+
list(APPEND NMAKE_OPTIONS_DBG "FREEXL_LIBS=${FREEXL_LIBRARY_DBG}")
176176
endif()
177177

178178
# libkml
179179
if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib")
180180
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" LIBKML_DIR)
181-
list(APPEND NMAKE_OPTIONS LIBKML_DIR=${LIBKML_DIR})
181+
list(APPEND NMAKE_OPTIONS "LIBKML_DIR=${LIBKML_DIR}")
182182
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LIBKML_INCLUDE)
183-
list(APPEND NMAKE_OPTIONS LIBKML_INCLUDE=-I${LIBKML_INCLUDE})
183+
list(APPEND NMAKE_OPTIONS "LIBKML_INCLUDE=-I${LIBKML_INCLUDE}")
184184
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib" KMLBASE_REL)
185185
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlbase.lib" KMLBASE_DBG)
186186
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlconvenience.lib" KMLCONVENIENCE_REL)
@@ -210,10 +210,10 @@ macro(find_dependency_win)
210210
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib" XERCES_LIBRARY_REL)
211211
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/xerces-c_3D.lib" XERCES_LIBRARY_DBG)
212212
list(APPEND NMAKE_OPTIONS ILI_ENABLED=YES)
213-
list(APPEND NMAKE_OPTIONS XERCES_DIR=${XERCES_DIR})
213+
list(APPEND NMAKE_OPTIONS "XERCES_DIR=${XERCES_DIR}")
214214
list(APPEND NMAKE_OPTIONS "XERCES_INCLUDE=-I${XERCES_INCLUDE} -I${XERCES_INCLUDE}/xercesc")
215-
list(APPEND NMAKE_OPTIONS_REL XERCES_LIB=${XERCES_LIBRARY_REL})
216-
list(APPEND NMAKE_OPTIONS_DBG XERCES_LIB=${XERCES_LIBRARY_DBG})
215+
list(APPEND NMAKE_OPTIONS_REL "XERCES_LIB=${XERCES_LIBRARY_REL}")
216+
list(APPEND NMAKE_OPTIONS_DBG "XERCES_LIB=${XERCES_LIBRARY_DBG}")
217217
endif()
218218

219219
endmacro()

Diff for: ‎ports/gdal/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gdal",
33
"version-semver": "3.5.1",
4-
"port-version": 4,
4+
"port-version": 5,
55
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
66
"homepage": "https://gdal.org",
77
"license": null,

0 commit comments

Comments
 (0)