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
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user