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

20
CMakeModules/FindOurDCMTK.cmake
View File

@ -44,6 +44,7 @@ FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
) )
FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
PATHS
${DCMTK_DIR}/ofstd/libsrc ${DCMTK_DIR}/ofstd/libsrc
${DCMTK_DIR}/ofstd/libsrc/Release ${DCMTK_DIR}/ofstd/libsrc/Release
${DCMTK_DIR}/ofstd/libsrc/Debug ${DCMTK_DIR}/ofstd/libsrc/Debug
@ -56,6 +57,7 @@ FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib /usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
@ -70,6 +72,7 @@ FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
) )
FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
PATHS
${DCMTK_DIR}/dcmdata/libsrc ${DCMTK_DIR}/dcmdata/libsrc
${DCMTK_DIR}/dcmdata/libsrc/Release ${DCMTK_DIR}/dcmdata/libsrc/Release
${DCMTK_DIR}/dcmdata/libsrc/Debug ${DCMTK_DIR}/dcmdata/libsrc/Debug
@ -82,6 +85,7 @@ FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib /usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
@ -96,6 +100,7 @@ FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
) )
FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
PATHS
${DCMTK_DIR}/dcmimgle/libsrc ${DCMTK_DIR}/dcmimgle/libsrc
${DCMTK_DIR}/dcmimgle/libsrc/Release ${DCMTK_DIR}/dcmimgle/libsrc/Release
${DCMTK_DIR}/dcmimgle/libsrc/Debug ${DCMTK_DIR}/dcmimgle/libsrc/Debug
@ -108,6 +113,7 @@ FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/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,6 +127,7 @@ FIND_PATH( DCMTK_dcmimage_INCLUDE_DIR diregist.h
) )
FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage
PATHS
${DCMTK_DIR}/dcmimage/libsrc ${DCMTK_DIR}/dcmimage/libsrc
${DCMTK_DIR}/dcmimage/libsrc/Release ${DCMTK_DIR}/dcmimage/libsrc/Release
${DCMTK_DIR}/dcmimage/libsrc/Debug ${DCMTK_DIR}/dcmimage/libsrc/Debug
@ -133,54 +140,67 @@ FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib /usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
PATHS
${DCMTK_DIR}/imagectn/libsrc/Release ${DCMTK_DIR}/imagectn/libsrc/Release
${DCMTK_DIR}/imagectn/libsrc/ ${DCMTK_DIR}/imagectn/libsrc/
${DCMTK_DIR}/imagectn/libsrc/Debug ${DCMTK_DIR}/imagectn/libsrc/Debug
${DCMTK_DIR}/lib
/usr/local/dicom/lib /usr/local/dicom/lib
/usr/local/lib64 /usr/local/lib64
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib /usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
PATHS
${DCMTK_DIR}/dcmnet/libsrc/Release ${DCMTK_DIR}/dcmnet/libsrc/Release
${DCMTK_DIR}/dcmnet/libsrc/Debug ${DCMTK_DIR}/dcmnet/libsrc/Debug
${DCMTK_DIR}/dcmnet/libsrc/ ${DCMTK_DIR}/dcmnet/libsrc/
${DCMTK_DIR}/lib
/usr/local/dicom/lib /usr/local/dicom/lib
/usr/local/lib64 /usr/local/lib64
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib /usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_oflog_LIBRARY oflog FIND_LIBRARY(DCMTK_oflog_LIBRARY oflog
PATHS
${DCMTK_DIR}/dcmnet/libsrc/Release ${DCMTK_DIR}/dcmnet/libsrc/Release
${DCMTK_DIR}/dcmnet/libsrc/Debug ${DCMTK_DIR}/dcmnet/libsrc/Debug
${DCMTK_DIR}/dcmnet/libsrc/ ${DCMTK_DIR}/dcmnet/libsrc/
${DCMTK_DIR}/lib
/usr/local/dicom/lib /usr/local/dicom/lib
/usr/local/lib64 /usr/local/lib64
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib /usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
FIND_LIBRARY(DCMTK_ofstd_LIBRARY ofstd FIND_LIBRARY(DCMTK_ofstd_LIBRARY ofstd
PATHS
${DCMTK_DIR}/dcmnet/libsrc/Release ${DCMTK_DIR}/dcmnet/libsrc/Release
${DCMTK_DIR}/dcmnet/libsrc/Debug ${DCMTK_DIR}/dcmnet/libsrc/Debug
${DCMTK_DIR}/dcmnet/libsrc/ ${DCMTK_DIR}/dcmnet/libsrc/
${DCMTK_DIR}/lib
/usr/local/dicom/lib /usr/local/dicom/lib
/usr/local/lib64 /usr/local/lib64
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib /usr/local/dicom/lib
PATH_SUFFIXES dcmtk
) )
IF( DCMTK_config_INCLUDE_DIR IF( DCMTK_config_INCLUDE_DIR