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

Added support for finding DCMTK-3.5.4 installed lib/include placement

Browse Source
This commit is contained in:
Robert Osfield 2008-09-17 11:43:14 +00:00
parent d57ad27fcc
commit 97b37cb117
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeModules/FindOurDCMTK.cmake
View File

@ -2,6 +2,7 @@
# #
# DCMTK_INCLUDE_DIR - Directories to include to use DCMTK # DCMTK_INCLUDE_DIR - Directories to include to use DCMTK
# DCMTK_ROOT_INCLUDE_DIR - root directory of DCMTK related include directories
# DCMTK_LIBRARIES - Files to link against to use DCMTK # DCMTK_LIBRARIES - Files to link against to use DCMTK
# DCMTK_FOUND - If false, don't try to use DCMTK # DCMTK_FOUND - If false, don't try to use DCMTK
# DCMTK_DIR - (optional) Source directory for DCMTK # DCMTK_DIR - (optional) Source directory for DCMTK
@ -12,13 +13,22 @@
# the source. # the source.
# #
# Written for VXL by Amitha Perera. # Written for VXL by Amitha Perera.
# # Modified by Robert Osfied to enable support for install placements of DCMTK 3.5.4 versions onwards
FIND_PATH( DCMTK_ROOT_INCLUDE_DIR dcmtk/config/osconfig.h
${DCMTK_DIR}/config/include
${DCMTK_DIR}/include
/usr/local/include/
/usr/include/
/usr/local/dicom/include/
)
FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
${DCMTK_DIR}/config/include ${DCMTK_DIR}/config/include
${DCMTK_DIR}/include ${DCMTK_DIR}/include
/usr/local/include/dcmtk/config /usr/local/include/dcmtk/config
/usr/include/dcmtk/config /usr/include/dcmtk/config
/usr/local/dicom/include/dcmtk/config
) )
FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
@ -26,6 +36,7 @@ FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
${DCMTK_DIR}/include/ofstd ${DCMTK_DIR}/include/ofstd
/usr/local/include/dcmtk/ofstd /usr/local/include/dcmtk/ofstd
/usr/include/dcmtk/ofstd /usr/include/dcmtk/ofstd
/usr/local/dicom/include/dcmtk/ofstd
) )
FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
@ -39,6 +50,7 @@ FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib
) )
@ -47,6 +59,7 @@ FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
${DCMTK_DIR}/include/dcmdata ${DCMTK_DIR}/include/dcmdata
/usr/local/include/dcmtk/dcmdata /usr/local/include/dcmtk/dcmdata
/usr/include/dcmtk/dcmdata /usr/include/dcmtk/dcmdata
/usr/local/dicom/include/dcmtk/dcmdata
) )
FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
@ -60,6 +73,7 @@ FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib
) )
@ -68,6 +82,7 @@ FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
${DCMTK_DIR}/include/dcmimgle ${DCMTK_DIR}/include/dcmimgle
/usr/local/include/dcmtk/dcmimgle /usr/local/include/dcmtk/dcmimgle
/usr/include/dcmtk/dcmimgle /usr/include/dcmtk/dcmimgle
/usr/local/dicom/include/dcmtk/dcmimgle
) )
FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
@ -81,6 +96,7 @@ FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib
) )
FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
@ -91,6 +107,7 @@ FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib
) )
FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
@ -101,6 +118,7 @@ FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/local/dicom/lib
) )

2
src/osgPlugins/dicom/CMakeLists.txt
View File

@ -1,6 +1,6 @@
IF (DCMTK_FOUND) IF (DCMTK_FOUND)
INCLUDE_DIRECTORIES( DCMTK_INCLUDE_DIRS ) INCLUDE_DIRECTORIES( ${DCMTK_ROOT_INCLUDE_DIR} )
SET(TARGET_SRC ReaderWriterDICOM.cpp ) SET(TARGET_SRC ReaderWriterDICOM.cpp )