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

Further tweak to include paths

Browse Source
This commit is contained in:
Robert Osfield 2009-01-12 16:37:38 +00:00
parent ded06dc421
commit 12a484593c
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeModules/FindOurDCMTK.cmake
View File

@ -14,6 +14,14 @@
# 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 # 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

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 )

8
src/osgPlugins/dicom/ReaderWriterDICOM.cpp
View File

@ -19,10 +19,10 @@
#ifdef USE_DCMTK #ifdef USE_DCMTK
#define HAVE_CONFIG_H #define HAVE_CONFIG_H
#include <osconfig.h> #include <dcmtk/config/osconfig.h>
#include <dcfilefo.h> #include <dcmtk/dcmdata/dcfilefo.h>
#include <dcdeftag.h> #include <dcmtk/dcmdata/dcdeftag.h>
#include <dcmimage.h> #include <dcmtk/dcmimgle/dcmimage.h>
#endif #endif
#ifdef USE_ITK #ifdef USE_ITK