|
 |
145919 |
diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/FindDCMTK.cmake
|
|
|
145919 |
--- cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk 2011-08-26 10:51:46.000000000 -0600
|
|
|
145919 |
+++ cmake-2.8.6-rc1/Modules/FindDCMTK.cmake 2011-08-29 16:58:07.299550799 -0600
|
|
|
145919 |
@@ -30,6 +30,10 @@
|
|
|
145919 |
# Written for VXL by Amitha Perera.
|
|
|
145919 |
# Upgraded for GDCM by Mathieu Malaterre.
|
|
|
145919 |
# Modified for EasyViz by Thomas Sondergaard.
|
|
|
145919 |
+#
|
|
|
145919 |
+# Wed Jul 27 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org>
|
|
|
145919 |
+# - Add all dcmtk libs
|
|
|
145919 |
+# - Add usr/lib to paths
|
|
|
145919 |
#
|
|
|
145919 |
|
|
|
145919 |
if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
|
|
|
145919 |
@@ -44,20 +48,26 @@ endif()
|
|
|
145919 |
|
|
|
145919 |
foreach(lib
|
|
|
145919 |
dcmdata
|
|
|
145919 |
+ dcmdsig
|
|
|
145919 |
dcmimage
|
|
|
145919 |
dcmimgle
|
|
|
145919 |
dcmjpeg
|
|
|
145919 |
+ dcmjpls
|
|
|
145919 |
dcmnet
|
|
|
145919 |
dcmpstat
|
|
|
145919 |
dcmqrdb
|
|
|
145919 |
- dcmsign
|
|
|
145919 |
dcmsr
|
|
|
145919 |
dcmtls
|
|
|
145919 |
+ dcmwlm
|
|
|
145919 |
ijg12
|
|
|
145919 |
ijg16
|
|
|
145919 |
ijg8
|
|
|
145919 |
+ libi2d
|
|
|
145919 |
+ oflog
|
|
|
145919 |
ofstd)
|
|
|
145919 |
|
|
|
145919 |
+
|
|
|
145919 |
+
|
|
|
145919 |
find_library(DCMTK_${lib}_LIBRARY
|
|
|
145919 |
${lib}
|
|
|
145919 |
PATHS
|
|
|
145919 |
@@ -66,7 +76,8 @@ foreach(lib
|
|
|
145919 |
${DCMTK_DIR}/${lib}/libsrc/Debug
|
|
|
145919 |
${DCMTK_DIR}/${lib}/Release
|
|
|
145919 |
${DCMTK_DIR}/${lib}/Debug
|
|
|
145919 |
- ${DCMTK_DIR}/lib)
|
|
|
145919 |
+ ${DCMTK_DIR}/lib
|
|
|
145919 |
+ /usr/lib/dcmtk)
|
|
|
145919 |
|
|
|
145919 |
mark_as_advanced(DCMTK_${lib}_LIBRARY)
|
|
|
145919 |
|
|
|
145919 |
@@ -82,13 +93,16 @@ set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
|
|
|
145919 |
set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
|
|
|
145919 |
set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
|
|
|
145919 |
set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
|
|
|
145919 |
+set(DCMTK_dcmjpls_TEST_HEADER djcodecd.h)
|
|
|
145919 |
set(DCMTK_dcmnet_TEST_HEADER assoc.h)
|
|
|
145919 |
set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h)
|
|
|
145919 |
set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h)
|
|
|
145919 |
set(DCMTK_dcmsign_TEST_HEADER sicert.h)
|
|
|
145919 |
set(DCMTK_dcmsr_TEST_HEADER dsrtree.h)
|
|
|
145919 |
set(DCMTK_dcmtls_TEST_HEADER tlslayer.h)
|
|
|
145919 |
+set(DCMTK_dcmwlm_TEST_HEADER wldsfs.h)
|
|
|
145919 |
set(DCMTK_ofstd_TEST_HEADER ofstdinc.h)
|
|
|
145919 |
+set(DCMTK_oflog_TEST_HEADER oflog.h)
|
|
|
145919 |
|
|
|
145919 |
foreach(dir
|
|
|
145919 |
config
|
|
|
145919 |
@@ -96,16 +110,20 @@ foreach(dir
|
|
|
145919 |
dcmimage
|
|
|
145919 |
dcmimgle
|
|
|
145919 |
dcmjpeg
|
|
|
145919 |
+ dcmjpls
|
|
|
145919 |
dcmnet
|
|
|
145919 |
dcmpstat
|
|
|
145919 |
dcmqrdb
|
|
|
145919 |
dcmsign
|
|
|
145919 |
dcmsr
|
|
|
145919 |
dcmtls
|
|
|
145919 |
+ dcmwlen
|
|
|
145919 |
+ oflog
|
|
|
145919 |
ofstd)
|
|
|
145919 |
find_path(DCMTK_${dir}_INCLUDE_DIR
|
|
|
145919 |
${DCMTK_${dir}_TEST_HEADER}
|
|
|
145919 |
PATHS
|
|
|
145919 |
+ /usr/include/dcmtk
|
|
|
145919 |
${DCMTK_DIR}/${dir}/include
|
|
|
145919 |
${DCMTK_DIR}/${dir}
|
|
|
145919 |
${DCMTK_DIR}/include/${dir}
|