Skip to content

Commit 754a1a7

Browse files
committed
Update to DCMTK 3.6.4
1 parent ddb347a commit 754a1a7

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

CMake/Externals/External_DCMTK.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif()
1919
if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
2020

2121
set(${proj}_REPOSITORY ${git_protocol}://github.com/jcfr/DCMTK)
22-
set(${proj}_GIT_TAG "c985845994fa378916c25954ee3e65914ee580ca") # Based of DCMTK-3.6.1_20161102
22+
set(${proj}_GIT_TAG "728784645e1768c671871a41bb56f1acfedce1ec") # emscripten-2018-11-29-1967b1313 (Based of DCMTK-3.6.4)
2323

2424
set(app_cache_args)
2525

@@ -37,6 +37,8 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
3737
endif()
3838
endmacro()
3939

40+
dcmtk_build_app_option(BUILD_cda2dcm_APP OFF)
41+
dcmtk_build_app_option(BUILD_dcm2json_APP OFF)
4042
dcmtk_build_app_option(BUILD_dcm2pdf_APP OFF)
4143
dcmtk_build_app_option(BUILD_dcm2pnm_APP ON)
4244
dcmtk_build_app_option(BUILD_dcm2xml_APP ON)
@@ -51,6 +53,7 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
5153
dcmtk_build_app_option(BUILD_dcmdump_APP ON)
5254
dcmtk_build_app_option(BUILD_dcmftest_APP ON)
5355
dcmtk_build_app_option(BUILD_dcmgpdir_APP OFF)
56+
dcmtk_build_app_option(BUILD_dcmicmp_APP OFF)
5457
dcmtk_build_app_option(BUILD_dcmj2pnm_APP OFF)
5558
dcmtk_build_app_option(BUILD_dcml2pnm_APP OFF)
5659
dcmtk_build_app_option(BUILD_dcmmkcrv_APP OFF)
@@ -88,6 +91,7 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
8891
dcmtk_build_app_option(BUILD_mdfdsman_APP OFF)
8992
dcmtk_build_app_option(BUILD_movescu_APP OFF)
9093
dcmtk_build_app_option(BUILD_pdf2dcm_APP OFF)
94+
dcmtk_build_app_option(BUILD_stl2dcm_APP OFF)
9195
dcmtk_build_app_option(BUILD_storescp_APP OFF)
9296
dcmtk_build_app_option(BUILD_storescu_APP OFF)
9397
dcmtk_build_app_option(BUILD_termscu_APP OFF)

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ Add / Remove applications
118118
Re-configuring the project setting any of these options allows to customize the
119119
list of applications bundled in the `dcmjs.js` module:
120120

121+
* [cda2dcm](http://support.dcmtk.org/docs/cda2dcm.html): `-DBUILD_cda2dcm_APP:BOOL=[ON|OFF]`
122+
* [dcm2json](http://support.dcmtk.org/docs/dcm2json.html): `-DBUILD_dcm2json_APP:BOOL=[ON|OFF]`
121123
* [dcm2pdf](http://support.dcmtk.org/docs/dcm2pdf.html): `-DBUILD_dcm2pdf_APP:BOOL=[ON|OFF]`
122124
* [dcm2pnm](http://support.dcmtk.org/docs/dcm2pnm.html): `-DBUILD_dcm2pnm_APP:BOOL=[ON|OFF]`
123125
* [dcm2xml](http://support.dcmtk.org/docs/dcm2xml.html): `-DBUILD_dcm2xml_APP:BOOL=[ON|OFF]`
@@ -132,6 +134,7 @@ list of applications bundled in the `dcmjs.js` module:
132134
* [dcmdump](http://support.dcmtk.org/docs/dcmdump.html): `-DBUILD_dcmdump_APP:BOOL=[ON|OFF]`
133135
* [dcmftest](http://support.dcmtk.org/docs/dcmftest.html): `-DBUILD_dcmftest_APP:BOOL=[ON|OFF]`
134136
* [dcmgpdir](http://support.dcmtk.org/docs/dcmgpdir.html): `-DBUILD_dcmgpdir_APP:BOOL=[ON|OFF]`
137+
* [dcmicmp](http://support.dcmtk.org/docs/dcmicmp.html): `-DBUILD_dcmicmp_APP:BOOL=[ON|OFF]`
135138
* [dcmj2pnm](http://support.dcmtk.org/docs/dcmj2pnm.html): `-DBUILD_dcmj2pnm_APP:BOOL=[ON|OFF]`
136139
* [dcml2pnm](http://support.dcmtk.org/docs/dcml2pnm.html): `-DBUILD_dcml2pnm_APP:BOOL=[ON|OFF]`
137140
* [dcmmkcrv](http://support.dcmtk.org/docs/dcmmkcrv.html): `-DBUILD_dcmmkcrv_APP:BOOL=[ON|OFF]`
@@ -169,6 +172,7 @@ list of applications bundled in the `dcmjs.js` module:
169172
* [mdfdsman](http://support.dcmtk.org/docs/mdfdsman.html): `-DBUILD_mdfdsman_APP:BOOL=[ON|OFF]`
170173
* [movescu](http://support.dcmtk.org/docs/movescu.html): `-DBUILD_movescu_APP:BOOL=[ON|OFF]`
171174
* [pdf2dcm](http://support.dcmtk.org/docs/pdf2dcm.html): `-DBUILD_pdf2dcm_APP:BOOL=[ON|OFF]`
175+
* [stl2dcm](http://support.dcmtk.org/docs/stl2dcm.html): `-DBUILD_stl2dcm_APP:BOOL=[ON|OFF]`
172176
* [storescp](http://support.dcmtk.org/docs/storescp.html): `-DBUILD_storescp_APP:BOOL=[ON|OFF]`
173177
* [storescu](http://support.dcmtk.org/docs/storescu.html): `-DBUILD_storescu_APP:BOOL=[ON|OFF]`
174178
* [termscu](http://support.dcmtk.org/docs/termscu.html): `-DBUILD_termscu_APP:BOOL=[ON|OFF]`

0 commit comments

Comments
 (0)