diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-07-05 15:17:58 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-07-05 15:17:58 (GMT) |
| commit | 3a5e24ff7cfc323e377ad8d8f84c010b68b86532 (patch) | |
| tree | 0acdfaff4c28e7ddf696713a4bc6ade659f674b4 /Modules | |
| parent | 4c00a1d1e68f969b8387f3765e30c3cf726ef895 (diff) | |
| download | CMake-3a5e24ff7cfc323e377ad8d8f84c010b68b86532.zip CMake-3a5e24ff7cfc323e377ad8d8f84c010b68b86532.tar.gz CMake-3a5e24ff7cfc323e377ad8d8f84c010b68b86532.tar.bz2 | |
ENH: Improvements by Julien
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindDCMTK.cmake | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake index 0cd7d89..b295bb0 100644 --- a/Modules/FindDCMTK.cmake +++ b/Modules/FindDCMTK.cmake @@ -25,6 +25,8 @@ FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd ${DCMTK_DIR}/ofstd/libsrc + ${DCMTK_DIR}/ofstd/libsrc/Release + ${DCMTK_DIR}/ofstd/libsrc/Debug ${DCMTK_DIR}/ofstd/Release ${DCMTK_DIR}/ofstd/Debug ${DCMTK_DIR}/lib @@ -38,6 +40,8 @@ FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata ${DCMTK_DIR}/dcmdata/libsrc + ${DCMTK_DIR}/dcmdata/libsrc/Release + ${DCMTK_DIR}/dcmdata/libsrc/Debug ${DCMTK_DIR}/dcmdata/Release ${DCMTK_DIR}/dcmdata/Debug ${DCMTK_DIR}/lib @@ -51,11 +55,25 @@ FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle ${DCMTK_DIR}/dcmimgle/libsrc + ${DCMTK_DIR}/dcmimgle/libsrc/Release + ${DCMTK_DIR}/dcmimgle/libsrc/Debug ${DCMTK_DIR}/dcmimgle/Release ${DCMTK_DIR}/dcmimgle/Debug ${DCMTK_DIR}/lib ) +FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb +${DCMTK_DIR}/imagectn/libsrc/Release +${DCMTK_DIR}/imagectn/libsrc/ +${DCMTK_DIR}/imagectn/libsrc/Debug +) + +FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet +${DCMTK_DIR}/dcmnet/libsrc/Release +${DCMTK_DIR}/dcmnet/libsrc/Debug +${DCMTK_DIR}/dcmnet/libsrc/ +) + IF( DCMTK_config_INCLUDE_DIR ) IF( DCMTK_ofstd_INCLUDE_DIR ) @@ -80,6 +98,20 @@ IF( DCMTK_dcmimgle_LIBRARY ) ${DCMTK_config_LIBRARY} ) + IF(DCMTK_imagedb_LIBRARY) + SET( DCMTK_LIBRARIES + ${DCMTK_LIBRARIES} + ${DCMTK_imagedb_LIBRARY} + ) + ENDIF(DCMTK_imagedb_LIBRARY) + + IF(DCMTK_dcmnet_LIBRARY) + SET( DCMTK_LIBRARIES + ${DCMTK_LIBRARIES} + ${DCMTK_dcmnet_LIBRARY} + ) + ENDIF(DCMTK_dcmnet_LIBRARY) + IF( WIN32 ) SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} netapi32 ) ENDIF( WIN32 ) |