From and incorported the addition from Paul Fotheringham, addition of define VCL_CAN_STATIC_CONST_INIT_FLOAT to be zero to solve build error under Linux

From Robert Osfield, general cleaned up ITK side to CMakeList.txt.
This commit is contained in:
Robert Osfield
2009-07-03 19:07:02 +00:00
parent 1d320d3ca1
commit cb1b874167

View File

@@ -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)