FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Jean-Christophe Lombardo, "On Fedora 14, dcmtk libs are under /usr/lib/dcmtk. I've added a PATH_SUFFIX to take that into account"

Browse Source
This commit is contained in:
Robert Osfield 2011-06-16 08:46:30 +00:00
parent 17b9cfad02
commit 14b12f94e5
1 changed files with 104 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
CMakeModules/FindOurDCMTK.cmake
View File

@ -44,18 +44,20 @@ FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
) )
FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
${DCMTK_DIR}/ofstd/libsrc PATHS
${DCMTK_DIR}/ofstd/libsrc/Release ${DCMTK_DIR}/ofstd/libsrc
${DCMTK_DIR}/ofstd/libsrc/Debug ${DCMTK_DIR}/ofstd/libsrc/Release
${DCMTK_DIR}/ofstd/Release ${DCMTK_DIR}/ofstd/libsrc/Debug
${DCMTK_DIR}/ofstd/Debug ${DCMTK_DIR}/ofstd/Release
${DCMTK_DIR}/lib ${DCMTK_DIR}/ofstd/Debug
/usr/local/dicom/lib ${DCMTK_DIR}/lib
/usr/local/lib64 /usr/local/dicom/lib
/usr/lib64 /usr/local/lib64
/usr/local/lib /usr/lib64
/usr/lib /usr/local/lib
/usr/local/dicom/lib /usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
@ -70,18 +72,20 @@ FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
) )
FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
${DCMTK_DIR}/dcmdata/libsrc PATHS
${DCMTK_DIR}/dcmdata/libsrc/Release ${DCMTK_DIR}/dcmdata/libsrc
${DCMTK_DIR}/dcmdata/libsrc/Debug ${DCMTK_DIR}/dcmdata/libsrc/Release
${DCMTK_DIR}/dcmdata/Release ${DCMTK_DIR}/dcmdata/libsrc/Debug
${DCMTK_DIR}/dcmdata/Debug ${DCMTK_DIR}/dcmdata/Release
${DCMTK_DIR}/lib ${DCMTK_DIR}/dcmdata/Debug
/usr/local/dicom/lib ${DCMTK_DIR}/lib
/usr/local/lib64 /usr/local/dicom/lib
/usr/lib64 /usr/local/lib64
/usr/local/lib /usr/lib64
/usr/lib /usr/local/lib
/usr/local/dicom/lib /usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
@ -96,18 +100,20 @@ FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
) )
FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
${DCMTK_DIR}/dcmimgle/libsrc PATHS
${DCMTK_DIR}/dcmimgle/libsrc/Release ${DCMTK_DIR}/dcmimgle/libsrc
${DCMTK_DIR}/dcmimgle/libsrc/Debug ${DCMTK_DIR}/dcmimgle/libsrc/Release
${DCMTK_DIR}/dcmimgle/Release ${DCMTK_DIR}/dcmimgle/libsrc/Debug
${DCMTK_DIR}/dcmimgle/Debug ${DCMTK_DIR}/dcmimgle/Release
${DCMTK_DIR}/lib ${DCMTK_DIR}/dcmimgle/Debug
/usr/local/dicom/lib ${DCMTK_DIR}/lib
/usr/local/lib64 /usr/local/dicom/lib
/usr/lib64 /usr/local/lib64
/usr/local/lib /usr/lib64
/usr/lib /usr/local/lib
/usr/local/dicom/lib /usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_PATH( DCMTK_dcmimage_INCLUDE_DIR diregist.h FIND_PATH( DCMTK_dcmimage_INCLUDE_DIR diregist.h
@ -121,66 +127,80 @@ FIND_PATH( DCMTK_dcmimage_INCLUDE_DIR diregist.h
) )
FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage
${DCMTK_DIR}/dcmimage/libsrc PATHS
${DCMTK_DIR}/dcmimage/libsrc/Release ${DCMTK_DIR}/dcmimage/libsrc
${DCMTK_DIR}/dcmimage/libsrc/Debug ${DCMTK_DIR}/dcmimage/libsrc/Release
${DCMTK_DIR}/dcmimage/Release ${DCMTK_DIR}/dcmimage/libsrc/Debug
${DCMTK_DIR}/dcmimage/Debug ${DCMTK_DIR}/dcmimage/Release
${DCMTK_DIR}/lib ${DCMTK_DIR}/dcmimage/Debug
/usr/local/dicom/lib ${DCMTK_DIR}/lib
/usr/local/lib64 /usr/local/dicom/lib
/usr/lib64 /usr/local/lib64
/usr/local/lib /usr/lib64
/usr/lib /usr/local/lib
/usr/local/dicom/lib /usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
${DCMTK_DIR}/imagectn/libsrc/Release PATHS
${DCMTK_DIR}/imagectn/libsrc/ ${DCMTK_DIR}/imagectn/libsrc/Release
${DCMTK_DIR}/imagectn/libsrc/Debug ${DCMTK_DIR}/imagectn/libsrc/
/usr/local/dicom/lib ${DCMTK_DIR}/imagectn/libsrc/Debug
/usr/local/lib64 ${DCMTK_DIR}/lib
/usr/lib64 /usr/local/dicom/lib
/usr/local/lib /usr/local/lib64
/usr/lib /usr/lib64
/usr/local/dicom/lib /usr/local/lib
/usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
${DCMTK_DIR}/dcmnet/libsrc/Release PATHS
${DCMTK_DIR}/dcmnet/libsrc/Debug ${DCMTK_DIR}/dcmnet/libsrc/Release
${DCMTK_DIR}/dcmnet/libsrc/ ${DCMTK_DIR}/dcmnet/libsrc/Debug
/usr/local/dicom/lib ${DCMTK_DIR}/dcmnet/libsrc/
/usr/local/lib64 ${DCMTK_DIR}/lib
/usr/lib64 /usr/local/dicom/lib
/usr/local/lib /usr/local/lib64
/usr/lib /usr/lib64
/usr/local/dicom/lib /usr/local/lib
/usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_oflog_LIBRARY oflog FIND_LIBRARY(DCMTK_oflog_LIBRARY oflog
${DCMTK_DIR}/dcmnet/libsrc/Release PATHS
${DCMTK_DIR}/dcmnet/libsrc/Debug ${DCMTK_DIR}/dcmnet/libsrc/Release
${DCMTK_DIR}/dcmnet/libsrc/ ${DCMTK_DIR}/dcmnet/libsrc/Debug
/usr/local/dicom/lib ${DCMTK_DIR}/dcmnet/libsrc/
/usr/local/lib64 ${DCMTK_DIR}/lib
/usr/lib64 /usr/local/dicom/lib
/usr/local/lib /usr/local/lib64
/usr/lib /usr/lib64
/usr/local/dicom/lib /usr/local/lib
/usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_ofstd_LIBRARY ofstd FIND_LIBRARY(DCMTK_ofstd_LIBRARY ofstd
${DCMTK_DIR}/dcmnet/libsrc/Release PATHS
${DCMTK_DIR}/dcmnet/libsrc/Debug ${DCMTK_DIR}/dcmnet/libsrc/Release
${DCMTK_DIR}/dcmnet/libsrc/ ${DCMTK_DIR}/dcmnet/libsrc/Debug
/usr/local/dicom/lib ${DCMTK_DIR}/dcmnet/libsrc/
/usr/local/lib64 ${DCMTK_DIR}/lib
/usr/lib64 /usr/local/dicom/lib
/usr/local/lib /usr/local/lib64
/usr/lib /usr/lib64
/usr/local/dicom/lib /usr/local/lib
/usr/lib
/usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
IF( DCMTK_config_INCLUDE_DIR IF( DCMTK_config_INCLUDE_DIR