diff --git a/src/osgPlugins/dicom/CMakeLists.txt b/src/osgPlugins/dicom/CMakeLists.txt
index 531dc67cf..9b9b8ea60 100644
--- a/src/osgPlugins/dicom/CMakeLists.txt
+++ b/src/osgPlugins/dicom/CMakeLists.txt
@@ -1,4 +1,5 @@
-IF(DCMTK_FOUND)
+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})
 
@@ -12,21 +13,21 @@ ELSEIF(ITK_FOUND)
 
     INCLUDE(${ITK_USE_FILE})
 
-    INCLUDE_DIRECTORIES( ITK_INCLUDE_DIRS )
-
     SET(TARGET_SRC ReaderWriterDICOM.cpp )
 
-    LINK_DIRECTORIES(${ITK_LIBRARY_DIRS})
-
-    # LINK_LIBRARIES(${ITK_LIBRARIES})
-
     LINK_LIBRARIES(ITKCommon ITKIO)
 
     ADD_DEFINITIONS(-DUSE_ITK)
+    ADD_DEFINITIONS(-DVCL_CAN_STATIC_CONST_INIT_FLOAT=0)
 
 ENDIF()
 
 SET(TARGET_ADDED_LIBRARIES osgVolume )
 
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -pedantic flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
 #### end var setup  ###
 SETUP_PLUGIN(dicom dicom)