From 01b27a9fb225324d9eae9b822f551aa2f796872f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 3 Jul 2009 19:08:55 +0000 Subject: [PATCH] From Paul Fotheringham, fixed linux build error when compiling dicom plugin against ITK by adding define VCL_CAN_STATIC_CONST_INIT_FLOAT to be zero. From Robert Osfield, general clean up of CMakeLists.txt under ITK side --- src/osgPlugins/dicom/CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/osgPlugins/dicom/CMakeLists.txt b/src/osgPlugins/dicom/CMakeLists.txt index 75c61828c..ff77e1f8c 100644 --- a/src/osgPlugins/dicom/CMakeLists.txt +++ b/src/osgPlugins/dicom/CMakeLists.txt @@ -1,7 +1,7 @@ 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 ) @@ -15,23 +15,22 @@ ELSE(DCMTK_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(ITK_FOUND) ENDIF(DCMTK_FOUND) - 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)