Attachment #350734 for bug #347187

View | Details | Raw Unified | Return to bug 347187
Collapse All | Expand All

Lines 3-9 Link Here

(-)elastix-4.6/src/Common/MevisDicomTiff/CMakeLists.txt (-1 / +2 lines)
3		3
4	IF( ELASTIX_USE_MEVISDICOMTIFF )	4	IF( ELASTIX_USE_MEVISDICOMTIFF )
5	ADD_DEFINITIONS( -D_ELASTIX_USE_MEVISDICOMTIFF )	5	ADD_DEFINITIONS( -D_ELASTIX_USE_MEVISDICOMTIFF )
6	ENDIF()	6
7		7
8	ADD_LIBRARY( mevisdcmtiff	8	ADD_LIBRARY( mevisdcmtiff
9	itkMevisDicomTiffImageIO.cxx	9	itkMevisDicomTiffImageIO.cxx
Lines 18-20 Link Here
18		18
19	# add mevisdcmtiff to the list of target_link_libraries in your cmakelists.txt file.	19	# add mevisdcmtiff to the list of target_link_libraries in your cmakelists.txt file.
20		20
		21	ENDIF()




  xoutlib
  elxCommon
  elxCore
  ${mevisdcmtifflib}
  ${AllComponentLibs}
  ${ITK_LIBRARIES}
)

  xoutlib
  elxCommon
  elxCore
  ${mevisdcmtifflib}
  ${AllComponentLibs}
  ${ITK_LIBRARIES}
)

IF( ELASTIX_USE_MEVISDICOMTIFF )
  TARGET_LINK_LIBRARIES( elastix   ${mevisdcmtifflib})
  TARGET_LINK_LIBRARIES( transformix ${mevisdcmtifflib})
ENDIF( ELASTIX_USE_MEVISDICOMTIFF )
#---------------------------------------------------------------------
# Define the install directory for elastix and transformix.


Lines 64-71 Link Here

(-)elastix-4.6/src/Core/Main/elastix.cxx (+2 lines)
64	typedef std::queue< ArgPairType > ParameterFileListType;	64	typedef std::queue< ArgPairType > ParameterFileListType;
65	typedef ParameterFileListType::value_type ParameterFileListEntryType;	65	typedef ParameterFileListType::value_type ParameterFileListEntryType;
66		66
		67	#ifdef _ELASTIX_USE_MEVISDICOMTIFF
67	/** Support Mevis Dicom Tiff (if selected in cmake) */	68	/** Support Mevis Dicom Tiff (if selected in cmake) */
68	RegisterMevisDicomTiff();	69	RegisterMevisDicomTiff();
		70	#endif
69		71
70	/** Some declarations and initialisations. */	72	/** Some declarations and initialisations. */
71	ElastixMainVectorType elastices;	73	ElastixMainVectorType elastices;

Lines 55-63 Link Here

(-)elastix-4.6/src/Core/Main/transformix.cxx (-1 / +2 lines)
55	typedef TransformixMainType::ArgumentMapType ArgumentMapType;	55	typedef TransformixMainType::ArgumentMapType ArgumentMapType;
56	typedef ArgumentMapType::value_type ArgumentMapEntryType;	56	typedef ArgumentMapType::value_type ArgumentMapEntryType;
57		57
		58	#ifdef _ELASTIX_USE_MEVISDICOMTIFF
58	/** Support Mevis Dicom Tiff (if selected in cmake) */	59	/** Support Mevis Dicom Tiff (if selected in cmake) */
59	RegisterMevisDicomTiff();	60	RegisterMevisDicomTiff();
60		61	#endif
61	/** Declare an instance of the Transformix class. */	62	/** Declare an instance of the Transformix class. */
62	TransformixMainPointer transformix;	63	TransformixMainPointer transformix;
63		64




  target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}
    elxCommon # needed for elxTimer
    ${ITK_LIBRARIES}
    ${mevisdcmtifflib}
  )

if( ELASTIX_USE_MEVISDICOMTIFF )
  target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}     ${mevisdcmtifflib})
endif( ELASTIX_USE_MEVISDICOMTIFF )


  # Group in IDE's like Visual Studio
  set_property( TARGET ${ELXTEST_EXECUTABLE_NAME} PROPERTY FOLDER "tests" )


Return to bug 347187

Lines 142-148 Link Here

(-)elastix-4.6/src/Core/CMakeLists.txt (-2 / +4 lines)
142	xoutlib	142	xoutlib
143	elxCommon	143	elxCommon
144	elxCore	144	elxCore
145	${mevisdcmtifflib}
146	${AllComponentLibs}	145	${AllComponentLibs}
147	${ITK_LIBRARIES}	146	${ITK_LIBRARIES}
148	)	147	)
Lines 155-165 Link Here
155	xoutlib	154	xoutlib
156	elxCommon	155	elxCommon
157	elxCore	156	elxCore
158	${mevisdcmtifflib}
159	${AllComponentLibs}	157	${AllComponentLibs}
160	${ITK_LIBRARIES}	158	${ITK_LIBRARIES}
161	)	159	)
162		160
		161	IF( ELASTIX_USE_MEVISDICOMTIFF )
		162	TARGET_LINK_LIBRARIES( elastix ${mevisdcmtifflib})
		163	TARGET_LINK_LIBRARIES( transformix ${mevisdcmtifflib})
		164	ENDIF( ELASTIX_USE_MEVISDICOMTIFF )
163	#---------------------------------------------------------------------	165	#---------------------------------------------------------------------
164	# Define the install directory for elastix and transformix.	166	# Define the install directory for elastix and transformix.
165		167

Lines 45-53 Link Here

(-)elastix-4.6/src/Testing/CMakeLists.txt (-1 / +5 lines)
45	target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}	45	target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}
46	elxCommon # needed for elxTimer	46	elxCommon # needed for elxTimer
47	${ITK_LIBRARIES}	47	${ITK_LIBRARIES}
48	${mevisdcmtifflib}
49	)	48	)
50		49
		50	if( ELASTIX_USE_MEVISDICOMTIFF )
		51	target_link_libraries( ${ELXTEST_EXECUTABLE_NAME} ${mevisdcmtifflib})
		52	endif( ELASTIX_USE_MEVISDICOMTIFF )
		53
		54
51	# Group in IDE's like Visual Studio	55	# Group in IDE's like Visual Studio
52	set_property( TARGET ${ELXTEST_EXECUTABLE_NAME} PROPERTY FOLDER "tests" )	56	set_property( TARGET ${ELXTEST_EXECUTABLE_NAME} PROPERTY FOLDER "tests" )
53		57