Changeset 10423

Timestamp:

06/26/09 18:39:44 (4 years ago)

Author:

robert

Message:

Added search in /usr/local/dicom for dcmtk.

Location:

OpenSceneGraph/trunk

Files:

• CMakeModules/FindOurDCMTK.cmake (modified) (10 diffs)
• src/osgPlugins/dicom/CMakeLists.txt (modified) (1 diff)

OpenSceneGraph/trunk/CMakeModules/FindOurDCMTK.cmake

@@ -18 +18 @@
     ${DCMTK_DIR}/config/include
     ${DCMTK_DIR}/include
+    /usr/local/dicom/include
     /usr/local/include/
     /usr/include/
@@ -27 +28 @@
     ${DCMTK_DIR}/config/include
     ${DCMTK_DIR}/include
+    /usr/local/dicom/include
     /usr/local/include/dcmtk/config
     /usr/include/dcmtk/config
@@ -36 +38 @@
     ${DCMTK_DIR}/ofstd/include
     ${DCMTK_DIR}/include/ofstd
+    /usr/local/dicom/include/dcmtk/ofstd
     /usr/local/include/dcmtk/ofstd
     /usr/include/dcmtk/ofstd
@@ -48 +51 @@
     ${DCMTK_DIR}/ofstd/Debug
     ${DCMTK_DIR}/lib
+    /usr/local/dicom/lib
     /usr/local/lib64
     /usr/lib64
@@ -60 +64 @@
     ${DCMTK_DIR}/dcmdata/include
     ${DCMTK_DIR}/include/dcmdata
+    /usr/local/dicom/include/dcmtk/dcmdata
     /usr/local/include/dcmtk/dcmdata
     /usr/include/dcmtk/dcmdata
@@ -72 +77 @@
     ${DCMTK_DIR}/dcmdata/Debug
     ${DCMTK_DIR}/lib
+    /usr/local/dicom/lib
     /usr/local/lib64
     /usr/lib64
@@ -84 +90 @@
     ${DCMTK_DIR}/dcmimgle/include
     ${DCMTK_DIR}/include/dcmimgle
+    /usr/local/dicom/include/dcmtk/dcmimgle
     /usr/local/include/dcmtk/dcmimgle
     /usr/include/dcmtk/dcmimgle
@@ -96 +103 @@
     ${DCMTK_DIR}/dcmimgle/Debug
     ${DCMTK_DIR}/lib
+    /usr/local/dicom/lib
     /usr/local/lib64
     /usr/lib64
@@ -107 +115 @@
     ${DCMTK_DIR}/imagectn/libsrc/
     ${DCMTK_DIR}/imagectn/libsrc/Debug
+    /usr/local/dicom/lib
     /usr/local/lib64
     /usr/lib64
@@ -118 +127 @@
     ${DCMTK_DIR}/dcmnet/libsrc/Debug
     ${DCMTK_DIR}/dcmnet/libsrc/
+    /usr/local/dicom/lib
     /usr/local/lib64
     /usr/lib64

OpenSceneGraph/trunk/src/osgPlugins/dicom/CMakeLists.txt

@@ -1 +1 @@
 IF(DCMTK_FOUND)
     # note, we have to include a '/' in front of the directory string to prevent a CMake bug from ignoring the directory
-    INCLUDE_DIRECTORIES(/${DCMTK_ROOT_INCLUDE_DIR})
+    INCLUDE_DIRECTORIES(${DCMTK_ROOT_INCLUDE_DIR})
 
     SET(TARGET_SRC ReaderWriterDICOM.cpp )