diff --git a/CMake/CppcheckTargets.cmake b/CMake/CppcheckTargets.cmake index e7298ea1cdb..d0928b0e8b3 100644 --- a/CMake/CppcheckTargets.cmake +++ b/CMake/CppcheckTargets.cmake @@ -43,7 +43,7 @@ if(CPPCHECK_FOUND) endif() # ------------------------------------------------------------------------------ -macro( get_cppcheck_arg ) +macro(get_cppcheck_arg) if(FORCE IN_LIST _input) list(APPEND _cppcheck_args ${CPPCHECK_FORCE_ARG}) @@ -98,17 +98,17 @@ endmacro() # add_cppcheck_dir function(add_cppcheck_dir _name _dir _include_dirs) if(CPPCHECK_FOUND) - set(_cppcheck_args ) + set(_cppcheck_args) set(_input ${ARGN}) - get_cppcheck_arg( ${_input} ) + get_cppcheck_arg(${_input}) # -------------------------------------------------------------- - foreach( _includeDirs ${_include_dirs} ) - set( _cppcheck_include ${_cppcheck_include} -I${_includeDirs} ) + foreach(_includeDirs ${_include_dirs}) + set(_cppcheck_include ${_cppcheck_include} -I${_includeDirs}) endforeach() - set( _cppcheck_compile_args ${_cppcheck_include} ) + set(_cppcheck_compile_args ${_cppcheck_include}) itk_add_test( NAME @@ -150,10 +150,10 @@ function(add_cppcheck_sources _targetname) if(CPPCHECK_FOUND) # Normally --force should not be required, but since all compiler definitions # can't be detected, it is better to enforce testing all possibilities - set(_cppcheck_args ) + set(_cppcheck_args) set(_input ${ARGN}) - get_cppcheck_arg( "${_input}" ) + get_cppcheck_arg("${_input}") set(_files) foreach(_source ${_input}) @@ -179,12 +179,12 @@ function(add_cppcheck_sources _targetname) endforeach() # let's take of include dirs here - get_property( mytargINCLUDES DIRECTORY + get_property(mytargINCLUDES DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY INCLUDE_DIRECTORIES) - set( _cppcheck_include ) - foreach( _includeDirs ${mytargINCLUDES} ) - set( _cppcheck_include ${_cppcheck_include} -I${_includeDirs} ) + set(_cppcheck_include) + foreach(_includeDirs ${mytargINCLUDES}) + set(_cppcheck_include ${_cppcheck_include} -I${_includeDirs}) endforeach() # -------------------------------------------------------------- @@ -194,13 +194,13 @@ function(add_cppcheck_sources _targetname) get_property(mytargDEFINITIONS DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY COMPILE_DEFINITIONS) - set( _cppcheck_def ) - foreach( _compiledef ${mytargDEFINITIONS} ) - set( _cppcheck_def ${_cppcheck_def} -D${_compiledef} ) + set(_cppcheck_def) + foreach(_compiledef ${mytargDEFINITIONS}) + set(_cppcheck_def ${_cppcheck_def} -D${_compiledef}) endforeach() # -------------------------------------------------------------- - set( _cppcheck_compile_args ${_cppcheck_include} ${_cppcheck_def} ) + set(_cppcheck_compile_args ${_cppcheck_include} ${_cppcheck_def}) itk_add_test( NAME @@ -243,10 +243,10 @@ function(add_cppcheck _name) "add_cppcheck given a target name that does not exist: '${_name}' !") endif() if(CPPCHECK_FOUND) - set(_cppcheck_args ) + set(_cppcheck_args) set(_input ${ARGN}) - get_cppcheck_arg( ${_input} ) + get_cppcheck_arg(${_input}) get_target_property(_cppcheck_sources "${_name}" SOURCES) set(_files) @@ -259,26 +259,26 @@ function(add_cppcheck _name) endforeach() # let's take of include dirs here - get_property( mytargINCLUDES DIRECTORY + get_property(mytargINCLUDES DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY INCLUDE_DIRECTORIES) - set( _cppcheck_include ) - foreach( _includeDirs ${mytargINCLUDES} ) - set( _cppcheck_include "${_cppcheck_include} -I ${_includeDirs}" ) + set(_cppcheck_include) + foreach(_includeDirs ${mytargINCLUDES}) + set(_cppcheck_include "${_cppcheck_include} -I ${_includeDirs}") endforeach() # -------------------------------------------------------------- # let's take of compile definitions here get_property(mytargDEFINITIONS DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY COMPILE_DEFINITIONS ) + "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY COMPILE_DEFINITIONS) - set( _cppcheck_def ) - foreach( _compiledef ${mytargDEFINITIONS} ) - set( _cppcheck_def ${_cppcheck_def} -D${_compiledef} ) + set(_cppcheck_def) + foreach(_compiledef ${mytargDEFINITIONS}) + set(_cppcheck_def ${_cppcheck_def} -D${_compiledef}) endforeach() # -------------------------------------------------------------- - set( _cppcheck_compile_args --check-config ${_cppcheck_include} ${_cppcheck_def} ) + set(_cppcheck_compile_args --check-config ${_cppcheck_include} ${_cppcheck_def}) itk_add_test( NAME diff --git a/CMake/ExternalData.cmake b/CMake/ExternalData.cmake index ebf5882891b..f5c8e4fa671 100644 --- a/CMake/ExternalData.cmake +++ b/CMake/ExternalData.cmake @@ -1126,10 +1126,10 @@ if("${ExternalData_ACTION}" STREQUAL "fetch") string(REPLACE "+" ";" exts_list "${exts}") set(succeeded 0) set(errorMsg "") - set(hash_list ) - set(algo_list ) - set(hash ) - set(algo ) + set(hash_list) + set(algo_list) + set(hash) + set(algo) foreach(ext ${exts_list}) file(READ "${name}${ext}" hash) string(STRIP "${hash}" hash) diff --git a/CMake/FindFFTW.cmake b/CMake/FindFFTW.cmake index 4b6a6fd50be..e2799e4bb8a 100644 --- a/CMake/FindFFTW.cmake +++ b/CMake/FindFFTW.cmake @@ -192,7 +192,7 @@ if(ITK_USE_FFTWD OR ITK_USE_FFTWF) get_filename_component(FFTWD_THREADS_LIB ${FFTWD_THREADS_LIB} NAME) set(FFTWD_LIBRARIES ${FFTWD_BASE_LIB}) if(FFTWD_THREADS_LIB) - set(FFTWD_LIBRARIES ${FFTWD_THREADS_LIB} ${FFTWD_BASE_LIB} ) + set(FFTWD_LIBRARIES ${FFTWD_THREADS_LIB} ${FFTWD_BASE_LIB}) endif() else() message(FATAL_ERROR "fftw3 not found.") diff --git a/CMake/Findcppcheck.cmake b/CMake/Findcppcheck.cmake index 58e2748b539..9fc0d911694 100644 --- a/CMake/Findcppcheck.cmake +++ b/CMake/Findcppcheck.cmake @@ -68,7 +68,7 @@ if(CPPCHECK_EXECUTABLE) set(CPPCHECK_VERBOSE_ARG --verbose) set(CPPCHECK_INCLUDEPATH_ARG -I) set(CPPCHECK_DEFINITION_ARG -D) - set( CPPCHECK_ALL_ARG --enable=all) + set(CPPCHECK_ALL_ARG --enable=all) # Check for the two types of command line arguments by just trying them execute_process(COMMAND @@ -82,9 +82,9 @@ if(CPPCHECK_EXECUTABLE) ERROR_QUIET ) - if( "${_cppcheck_enable_style_result}" EQUAL 0 ) + if("${_cppcheck_enable_style_result}" EQUAL 0) - set( CPPCHECK_STYLE_ARG --enable=style) + set(CPPCHECK_STYLE_ARG --enable=style) # How to display errors and warnings: if(MSVC) @@ -100,7 +100,7 @@ if(CPPCHECK_EXECUTABLE) endif() else() - message( "This file supports only version of cppcheck is newer than 1.43!" ) + message("This file supports only version of cppcheck is newer than 1.43!") endif() @@ -129,10 +129,10 @@ if(CPPCHECK_EXECUTABLE) ERROR_QUIET ) - if( "${_cppcheck_enable_unused_function_results}" EQUAL 0 ) + if("${_cppcheck_enable_unused_function_results}" EQUAL 0) set(CPPCHECK_UNUSEDFUNC_ARG --enable=unusedFunction) else() - set(CPPCHECK_UNUSEDFUNC_ARG ) + set(CPPCHECK_UNUSEDFUNC_ARG) endif() endif() @@ -152,7 +152,7 @@ if(CPPCHECK_EXECUTABLE) # supported since set(CPPCHECK_INFORMATION_ARG --enable=information) else() - set(CPPCHECK_INFORMATION_ARG ) + set(CPPCHECK_INFORMATION_ARG) endif() execute_process(COMMAND @@ -170,7 +170,7 @@ if(CPPCHECK_EXECUTABLE) # supported since set(CPPCHECK_MISSING_INCLUDE_ARG --enable=missingInclude) else() - set(CPPCHECK_MISSING_INCLUDE_ARG ) + set(CPPCHECK_MISSING_INCLUDE_ARG) endif() endif() diff --git a/CMake/GetGitRevisionDescription.cmake b/CMake/GetGitRevisionDescription.cmake index c6b4af6a026..fd743589607 100644 --- a/CMake/GetGitRevisionDescription.cmake +++ b/CMake/GetGitRevisionDescription.cmake @@ -96,7 +96,7 @@ function(get_git_head_revision _refvar _hashvar) endfunction() # get the number of commits since the file has last been modified -function(git_commits_since file _commits ) +function(git_commits_since file _commits) get_git_head_revision(ref head) set(src_dir ${PROJECT_SOURCE_DIR}) @@ -108,7 +108,7 @@ function(git_commits_since file _commits ) RESULT_VARIABLE failed ) if(failed) - set( tag "") + set(tag "") endif() execute_process(COMMAND ${GIT_EXECUTABLE} rev-list ${tag}..${head} @@ -119,11 +119,11 @@ function(git_commits_since file _commits ) ) if(failed) - set( rev_list "") + set(rev_list "") endif() - string( REGEX MATCHALL "[a-fA-F0-9]+" rev_list "${rev_list}") - list( LENGTH rev_list COUNT) + string(REGEX MATCHALL "[a-fA-F0-9]+" rev_list "${rev_list}") + list(LENGTH rev_list COUNT) set(${_commits} "${COUNT}" PARENT_SCOPE) endfunction() diff --git a/CMake/ITKClangFormatSetup.cmake b/CMake/ITKClangFormatSetup.cmake index 43780b98254..6c2696d6b1d 100644 --- a/CMake/ITKClangFormatSetup.cmake +++ b/CMake/ITKClangFormatSetup.cmake @@ -11,8 +11,8 @@ option(ITK_USE_CLANG_FORMAT "Enable the use of clang-format enforce ITK coding style." ${BUILD_TESTING}) mark_as_advanced(ITK_USE_CLANG_FORMAT) -if ( ITK_USE_CLANG_FORMAT AND NOT EXISTS "${CLANG_FORMAT_EXECUTABLE}" ) - # Download pre-built binaries (about 2M ) of clang-format extracted from +if ( ITK_USE_CLANG_FORMAT AND NOT EXISTS "${CLANG_FORMAT_EXECUTABLE}") + # Download pre-built binaries (about 2M) of clang-format extracted from # https://releases.llvm.org/download.html and cached on data.kitware.com # # Darwin - macOS/OS X (Clang, GCC) https://releases.llvm.org/8.0.0/clang+llvm-8.0.0-x86_64-apple-darwin.tar.xz @@ -31,12 +31,12 @@ if ( ITK_USE_CLANG_FORMAT AND NOT EXISTS "${CLANG_FORMAT_EXECUTABLE}" ) # Android - Android NDK (GCC, Clang) # CrayLinuxEnvironment - Cray supercomputers (Cray compiler) # MSYS - Windows (MSYS2 shell native GCC) - if ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" ) - set( CLANG_FORMAT_DOWNLOAD_URL "https://data.kitware.com/api/v1/file/5d274e88877dfcc902effc47/download" ) - elseif ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" ) - set( CLANG_FORMAT_DOWNLOAD_URL "https://data.kitware.com/api/v1/file/5d2b8775877dfcc902fd8236/download" ) - elseif ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" ) - set( CLANG_FORMAT_DOWNLOAD_URL "https://data.kitware.com/api/v1/file/5d2b8c87877dfcc902fda594/download" ) + if ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + set(CLANG_FORMAT_DOWNLOAD_URL "https://data.kitware.com/api/v1/file/5d274e88877dfcc902effc47/download") + elseif ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + set(CLANG_FORMAT_DOWNLOAD_URL "https://data.kitware.com/api/v1/file/5d2b8775877dfcc902fd8236/download") + elseif ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") + set(CLANG_FORMAT_DOWNLOAD_URL "https://data.kitware.com/api/v1/file/5d2b8c87877dfcc902fda594/download") else () message(FATAL_ERROR "UNKOWN SYSTEM: Set CLANG_FORMAT_EXECUTABLE manually to the clang-format version 8.0 binary") endif() @@ -49,8 +49,8 @@ if ( ITK_USE_CLANG_FORMAT AND NOT EXISTS "${CLANG_FORMAT_EXECUTABLE}" ) file(COPY "${ITK_BINARY_DIR}/temp/${CLANG_FORMAT_EXECUTABLE_NAME}" DESTINATION "${ITK_BINARY_DIR}" FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ) - unset( CLANG_FORMAT_DOWNLOAD_URL ) - set( CLANG_FORMAT_EXECUTABLE "${ITK_BINARY_DIR}/${CLANG_FORMAT_EXECUTABLE_NAME}" CACHE FILEPATH "The binary for clang-format" FORCE) + unset(CLANG_FORMAT_DOWNLOAD_URL) + set(CLANG_FORMAT_EXECUTABLE "${ITK_BINARY_DIR}/${CLANG_FORMAT_EXECUTABLE_NAME}" CACHE FILEPATH "The binary for clang-format" FORCE) endif() if(CLANG_FORMAT_EXECUTABLE) mark_as_advanced(CLANG_FORMAT_EXECUTABLE) diff --git a/CMake/ITKClangTidySetup.cmake b/CMake/ITKClangTidySetup.cmake index c2d0fad49b0..0dc437385ce 100644 --- a/CMake/ITKClangTidySetup.cmake +++ b/CMake/ITKClangTidySetup.cmake @@ -10,8 +10,8 @@ option(ITK_USE_CLANGTIDY "Enable the use of clang-tidy to enforce coding best pr mark_as_advanced(ITK_USE_CLANGTIDY) if(ITK_USE_CLANGTIDY) - if ( ITK_USE_CLANGTIDY AND NOT EXISTS "${CLANGTIDY_EXECUTABLE}" ) - find_program(CLANGTIDY_EXECUTABLE NAMES clang-tidy-13 clang-tidy-12 clang-tidy-11 clang-tidy-10 clang-tidy-9 clang-tidy-9 clang-tidy-8 clang-tidy ) + if ( ITK_USE_CLANGTIDY AND NOT EXISTS "${CLANGTIDY_EXECUTABLE}") + find_program(CLANGTIDY_EXECUTABLE NAMES clang-tidy-13 clang-tidy-12 clang-tidy-11 clang-tidy-10 clang-tidy-9 clang-tidy-9 clang-tidy-8 clang-tidy) endif() if(CLANGTIDY_EXECUTABLE AND EXISTS "${CLANGTIDY_EXECUTABLE}") diff --git a/CMake/ITKFactoryRegistration.cmake b/CMake/ITKFactoryRegistration.cmake index 1eac617df8c..a7ab478c1e9 100644 --- a/CMake/ITKFactoryRegistration.cmake +++ b/CMake/ITKFactoryRegistration.cmake @@ -63,7 +63,7 @@ # All factories can be disabled with the following CMake code: # foreach(_factory_name ${ITK_FACTORY_LIST}) # string(TOLOWER ${_factory_name} _f) -# set ( ITK_NO_${_factory_name}_FACTORY_REGISTER_MANAGER 1 ) +# set ( ITK_NO_${_factory_name}_FACTORY_REGISTER_MANAGER 1) # endforeach() # # @@ -207,7 +207,7 @@ macro(itk_generate_factory_registration) string(TOLOWER ${_factory_name} factory_lc) set(LIST_OF_${factory_uc}_FORMATS "") foreach(_format ${ITK_${_factory_name}}) - set(Module ) + set(Module) foreach(_module ${ITK_FACTORY_NAMES}) string(REGEX MATCH "^.*::${_factory_name}::${_format}$" Module_Matched "${_module}") if(Module_Matched) diff --git a/CMake/ITKGroups.cmake b/CMake/ITKGroups.cmake index cf388774367..0aec5db438b 100644 --- a/CMake/ITKGroups.cmake +++ b/CMake/ITKGroups.cmake @@ -68,24 +68,24 @@ compatibility as other modules in the toolkit.") #------------------------------------------------ # Find the modules in each group and the module name line in itk-module.cmake -foreach( group ${group_list} ) - set( _${group}_module_list ) - file( GLOB_RECURSE _${group}_module_files ${ITK_SOURCE_DIR}/Modules/${group}/itk-module.cmake ) - foreach( _module_file ${_${group}_module_files} ) - file( STRINGS ${_module_file} _module_line REGEX "itk_module[ \n]*\\([ \n]*[A-Za-z0-9]*" ) - string( REGEX MATCH "(\\([ \n]*)([A-Za-z0-9]*)" _module_name ${_module_line} ) - set( _module_name ${CMAKE_MATCH_2} ) - set( _${_module_name}_module_line ${_module_line} ) - list( APPEND _${group}_module_list ${_module_name} ) +foreach(group ${group_list}) + set(_${group}_module_list) + file(GLOB_RECURSE _${group}_module_files ${ITK_SOURCE_DIR}/Modules/${group}/itk-module.cmake) + foreach(_module_file ${_${group}_module_files}) + file(STRINGS ${_module_file} _module_line REGEX "itk_module[ \n]*\\([ \n]*[A-Za-z0-9]*") + string(REGEX MATCH "(\\([ \n]*)([A-Za-z0-9]*)" _module_name ${_module_line}) + set(_module_name ${CMAKE_MATCH_2}) + set(_${_module_name}_module_line ${_module_line}) + list(APPEND _${group}_module_list ${_module_name}) endforeach() endforeach() #------------------------------------------------ # Set up Doxygen Group descriptions -set( group_list_dox ) -foreach(group ${group_list} ) - set( group_list_dox +set(group_list_dox) +foreach(group ${group_list}) + set(group_list_dox "${group_list_dox} // ----------------------------------------------- // Group ${group} @@ -93,8 +93,8 @@ foreach(group ${group_list} ) ${${group}_documentation} */\n" ) - foreach(mod ${_${group}_module_list} ) - set( group_list_dox + foreach(mod ${_${group}_module_list}) + set(group_list_dox "${group_list_dox} /** \\defgroup ${mod} Module ${mod} \\ingroup Group-${group} */\n" @@ -102,7 +102,7 @@ ${${group}_documentation} */\n" endforeach() endforeach() -set( _content ${group_list_dox} ) +set(_content ${group_list_dox}) configure_file( "${ITK_SOURCE_DIR}/Utilities/Doxygen/Module.dox.in" "${ITK_BINARY_DIR}/Utilities/Doxygen/Modules/ITK-AllGroups.dox" @@ -113,16 +113,16 @@ configure_file( # Set a module name list for each group and exclude # Modules that should be OFF -foreach( group ${group_list} ) - set( _${group}_on_module_list ) - list( LENGTH _${group}_module_list _num_modules ) - set( _current_module 0 ) - while( ${_current_module} LESS ${_num_modules} ) - list( GET _${group}_module_list ${_current_module} _module_name ) - if( NOT ITK_MODULE_${_module_name}_EXCLUDE_FROM_DEFAULT ) - list( APPEND _${group}_on_module_list ${_module_name} ) +foreach(group ${group_list}) + set(_${group}_on_module_list) + list(LENGTH _${group}_module_list _num_modules) + set(_current_module 0) + while(${_current_module} LESS ${_num_modules}) + list(GET _${group}_module_list ${_current_module} _module_name) + if(NOT ITK_MODULE_${_module_name}_EXCLUDE_FROM_DEFAULT) + list(APPEND _${group}_on_module_list ${_module_name}) endif() - math( EXPR _current_module "${_current_module} + 1" ) + math(EXPR _current_module "${_current_module} + 1") endwhile() endforeach() @@ -130,10 +130,10 @@ if("$ENV{DASHBOARD_TEST_FROM_CTEST}" STREQUAL "") # developer build option(ITKGroup_Core "Request building core modules" ON) endif() -foreach( group ${group_list}) +foreach(group ${group_list}) option(ITKGroup_${group} "Request building ${group} modules" OFF) if (ITKGroup_${group}) - foreach (itk-module ${_${group}_on_module_list} ) + foreach (itk-module ${_${group}_on_module_list}) list(APPEND ITK_MODULE_${itk-module}_REQUEST_BY ITKGroup_${group}) endforeach() endif() diff --git a/CMake/ITKModuleCPPCheckTest.cmake b/CMake/ITKModuleCPPCheckTest.cmake index e4e47088c1a..daebe9952ea 100644 --- a/CMake/ITKModuleCPPCheckTest.cmake +++ b/CMake/ITKModuleCPPCheckTest.cmake @@ -3,12 +3,12 @@ option(ITK_CPPCHECK_TEST "Run cppcheck for static code analysis" OFF) mark_as_advanced(ITK_CPPCHECK_TEST) -macro( itk_module_cppcheck_test _name ) - if( EXISTS "${${_name}_SOURCE_DIR}/src" ) - file( GLOB _cxx_files "${${_name}_SOURCE_DIR}/src/*.cxx" ) - list( LENGTH _cxx_files _num_cxx_files ) +macro(itk_module_cppcheck_test _name) + if(EXISTS "${${_name}_SOURCE_DIR}/src") + file(GLOB _cxx_files "${${_name}_SOURCE_DIR}/src/*.cxx") + list(LENGTH _cxx_files _num_cxx_files) # let's make sure there are actually cxx files in the src dir - if( ${_num_cxx_files} GREATER 0 ) + if(${_num_cxx_files} GREATER 0) add_cppcheck_dir( ${_name}Sources # _name "${${_name}_SOURCE_DIR}/src" #_dir @@ -20,11 +20,11 @@ macro( itk_module_cppcheck_test _name ) endif() endif() - if( EXISTS "${${_name}_SOURCE_DIR}/test" ) - file( GLOB _cxx_files "${${_name}_SOURCE_DIR}/test/*.cxx" ) - list( LENGTH _cxx_files _num_cxx_files ) + if(EXISTS "${${_name}_SOURCE_DIR}/test") + file(GLOB _cxx_files "${${_name}_SOURCE_DIR}/test/*.cxx") + list(LENGTH _cxx_files _num_cxx_files) # let's make sure there are actually cxx files in the src dir - if( ${_num_cxx_files} GREATER 0 ) + if(${_num_cxx_files} GREATER 0) add_cppcheck_dir( ${_name}Tests # _name "${${_name}_SOURCE_DIR}/test" #_dir diff --git a/CMake/ITKModuleDoxygen.cmake b/CMake/ITKModuleDoxygen.cmake index d34b6184319..e21d347ebe9 100644 --- a/CMake/ITKModuleDoxygen.cmake +++ b/CMake/ITKModuleDoxygen.cmake @@ -3,31 +3,31 @@ # ${_name}.dot file which defines the local dependency as graph # which will be then processed by dot -macro( itk_module_doxygen _name ) +macro(itk_module_doxygen _name) # _content defines the content of the ${_name}.dox file - set( _content "/**\n" ) - set( _content "${_content} \\defgroup ${_name} Module ${_name} \n" ) - set( _content "${_content} ${ITK_MODULE_${_name}_DESCRIPTION} \n" ) + set(_content "/**\n") + set(_content "${_content} \\defgroup ${_name} Module ${_name} \n") + set(_content "${_content} ${ITK_MODULE_${_name}_DESCRIPTION} \n") - set( _content "${_content} \\par Dependencies:\n" ) + set(_content "${_content} \\par Dependencies:\n") # _dotcontent defines the content of the ${_name}.dot - set( _dotcontent "graph \"${_name}\" { \n") + set(_dotcontent "graph \"${_name}\" { \n") - foreach( d ${ITK_MODULE_${_name}_DEPENDS} ) - set( _content "${_content} \\li \\ref ${d} \n" ) - set( _dotcontent "${_dotcontent} \"${_name}\" -- \"${d}\"; \n" ) + foreach(d ${ITK_MODULE_${_name}_DEPENDS}) + set(_content "${_content} \\li \\ref ${d} \n") + set(_dotcontent "${_dotcontent} \"${_name}\" -- \"${d}\"; \n") endforeach() - set( _dotcontent "${_dotcontent} }") + set(_dotcontent "${_dotcontent} }") # add the image that will be generated by dot based on the defined graph # here - set( _content "${_content} \\dot \n" ) - set( _content "${_content} ${_dotcontent} \n" ) - set( _content "${_content} \\enddot \n" ) - set( _content "${_content} */\n" ) + set(_content "${_content} \\dot \n") + set(_content "${_content} ${_dotcontent} \n") + set(_content "${_content} \\enddot \n") + set(_content "${_content} */\n") if(ITK_SOURCE_DIR) configure_file( diff --git a/CMake/ITKModuleEnablement.cmake b/CMake/ITKModuleEnablement.cmake index 247ee81e9ca..ba7351a59b0 100644 --- a/CMake/ITKModuleEnablement.cmake +++ b/CMake/ITKModuleEnablement.cmake @@ -174,7 +174,7 @@ topological_sort(ITK_MODULES_ENABLED ITK_MODULE_ _DEPENDS) # # Set up CPack support # -set(ITK_MODULES_DISABLED_CPACK ) +set(ITK_MODULES_DISABLED_CPACK) foreach(m ${ITK_MODULES_DISABLED}) list(APPEND ITK_MODULES_DISABLED_CPACK "/${m}/") endforeach() diff --git a/CMake/ITKModuleExternal.cmake b/CMake/ITKModuleExternal.cmake index a4a3d431bc6..0b8c5004c83 100644 --- a/CMake/ITKModuleExternal.cmake +++ b/CMake/ITKModuleExternal.cmake @@ -197,7 +197,7 @@ if(ITK_WRAPPING) "ITK_WRAP_DOC" OFF) set(${itk-module}_WRAP_CASTXML ${ITK_WRAPPING}) set(${itk-module}_WRAP_SWIGINTERFACE ${ITK_WRAPPING}) - if( (${itk-module}_WRAP_PYTHON OR + if((${itk-module}_WRAP_PYTHON OR ${itk-module}_WRAP_DOC ) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/wrapping/CMakeLists.txt" diff --git a/CMake/ITKModuleHeaderTest.cmake b/CMake/ITKModuleHeaderTest.cmake index 82ad192a6f8..f9d2f9ff715 100644 --- a/CMake/ITKModuleHeaderTest.cmake +++ b/CMake/ITKModuleHeaderTest.cmake @@ -5,25 +5,25 @@ # dependencies. # Improve performance of MSVC GUI, by reducing number of header tests. -set( MAXIMUM_NUMBER_OF_HEADERS_default 35 ) -if( MSVC ) - set( MAXIMUM_NUMBER_OF_HEADERS_default 9999 ) +set(MAXIMUM_NUMBER_OF_HEADERS_default 35) +if(MSVC) + set(MAXIMUM_NUMBER_OF_HEADERS_default 9999) endif() # The maximum number of headers in a test. This helps limit memory issues, # and the cppcheck tests. However, if this is not unity, there is a slight # chance that problems may be hidden. For a complete header check, set to "1". -set( MAXIMUM_NUMBER_OF_HEADERS ${MAXIMUM_NUMBER_OF_HEADERS_default} CACHE STRING "The number of headers in a HeaderTest code." ) -mark_as_advanced( MAXIMUM_NUMBER_OF_HEADERS ) +set(MAXIMUM_NUMBER_OF_HEADERS ${MAXIMUM_NUMBER_OF_HEADERS_default} CACHE STRING "The number of headers in a HeaderTest code.") +mark_as_advanced(MAXIMUM_NUMBER_OF_HEADERS) if(NOT TARGET ITKHeaderTests) - add_custom_target( ITKHeaderTests + add_custom_target(ITKHeaderTests ${CMAKE_COMMAND} --build ${ITK_BINARY_DIR} - COMMENT "Regenerating and building the header tests." ) + COMMENT "Regenerating and building the header tests.") endif() -macro( itk_module_headertest _name ) - if( NOT ${_name}_THIRD_PARTY +macro(itk_module_headertest _name) + if(NOT ${_name}_THIRD_PARTY AND EXISTS ${${_name}_SOURCE_DIR}/include AND Python3_EXECUTABLE AND NOT (${_name} STREQUAL ITKTestKernel) @@ -34,46 +34,46 @@ macro( itk_module_headertest _name ) # WARNING: This code is highly coupled with the BuildHeaderTest.py file # below. Before making any logic changes here, make sure that script is not # effected. - set( _include ${${_name}_SOURCE_DIR}/include ) - file( GLOB _h_files ${_include}/*.h ) - set( _header_files ${_h_files} ) - list( LENGTH _h_files _num_headers ) - set( _outputs ${${_name}_BINARY_DIR}/test/${_name}HeaderTest1.cxx ) - set( _test_num 1 ) - set( _available_headers "${MAXIMUM_NUMBER_OF_HEADERS}" ) - while( ${_num_headers} GREATER ${_available_headers} ) - math( EXPR _test_num "${_test_num} + 1" ) - math( EXPR _available_headers "${_available_headers} + ${MAXIMUM_NUMBER_OF_HEADERS}" ) - list( APPEND _outputs - ${${_name}_BINARY_DIR}/test/${_name}HeaderTest${_test_num}.cxx ) + set(_include ${${_name}_SOURCE_DIR}/include) + file(GLOB _h_files ${_include}/*.h) + set(_header_files ${_h_files}) + list(LENGTH _h_files _num_headers) + set(_outputs ${${_name}_BINARY_DIR}/test/${_name}HeaderTest1.cxx) + set(_test_num 1) + set(_available_headers "${MAXIMUM_NUMBER_OF_HEADERS}") + while(${_num_headers} GREATER ${_available_headers}) + math(EXPR _test_num "${_test_num} + 1") + math(EXPR _available_headers "${_available_headers} + ${MAXIMUM_NUMBER_OF_HEADERS}") + list(APPEND _outputs + ${${_name}_BINARY_DIR}/test/${_name}HeaderTest${_test_num}.cxx) endwhile() - add_custom_target( ${_name}HeaderTestClean - ${CMAKE_COMMAND} -E remove ${_outputs} ) - add_dependencies( ITKHeaderTests ${_name}HeaderTestClean ) + add_custom_target(${_name}HeaderTestClean + ${CMAKE_COMMAND} -E remove ${_outputs}) + add_dependencies(ITKHeaderTests ${_name}HeaderTestClean) # We check to see if the headers are changed. If so, remove the header test # source files so they are regenerated. - set( _headers_list_md5 "${${_name}_BINARY_DIR}/test/CMakeFiles/HeadersList.md5" ) - list( SORT _header_files ) - string( MD5 _new_md5 "${_header_files}" ) - set( _regenerate_sources FALSE ) - if( NOT EXISTS "${_headers_list_md5}" ) - set( _regenerate_sources TRUE ) + set(_headers_list_md5 "${${_name}_BINARY_DIR}/test/CMakeFiles/HeadersList.md5") + list(SORT _header_files) + string(MD5 _new_md5 "${_header_files}") + set(_regenerate_sources FALSE) + if(NOT EXISTS "${_headers_list_md5}") + set(_regenerate_sources TRUE) else() - file( READ "${_headers_list_md5}" _old_md5 ) - if( NOT ("${_old_md5}" STREQUAL "${_new_md5}")) - set( _regenerate_sources TRUE ) + file(READ "${_headers_list_md5}" _old_md5) + if(NOT ("${_old_md5}" STREQUAL "${_new_md5}")) + set(_regenerate_sources TRUE) endif() endif() - file( WRITE "${_headers_list_md5}" "${_new_md5}" ) - if( ${_regenerate_sources} ) - file( REMOVE ${_outputs} ) + file(WRITE "${_headers_list_md5}" "${_new_md5}") + if(${_regenerate_sources}) + file(REMOVE ${_outputs}) endif() - set( _test_num 1 ) - foreach( _header_test_src ${_outputs} ) - get_filename_component( _test_name ${_header_test_src} NAME_WE ) + set(_test_num 1) + foreach(_header_test_src ${_outputs}) + get_filename_component(_test_name ${_header_test_src} NAME_WE) add_custom_command( OUTPUT ${_header_test_src} COMMAND ${Python3_EXECUTABLE} ${ITK_CMAKE_DIR}/../Utilities/Maintenance/BuildHeaderTest.py @@ -83,11 +83,11 @@ macro( itk_module_headertest _name ) ${MAXIMUM_NUMBER_OF_HEADERS} ${_test_num} ) - add_executable( ${_test_name} ${_header_test_src} ) - target_link_libraries( ${_test_name} PUBLIC ${${_name}_LIBRARIES} itksys ) + add_executable(${_test_name} ${_header_test_src}) + target_link_libraries(${_test_name} PUBLIC ${${_name}_LIBRARIES} itksys) add_dependencies(${_name}-all ${_test_name}) - math( EXPR _test_num "${_test_num} + 1" ) + math(EXPR _test_num "${_test_num} + 1") endforeach() endif() endmacro() diff --git a/CMake/ITKModuleKWStyleTest.cmake b/CMake/ITKModuleKWStyleTest.cmake index 228b40bfe59..2667ced0442 100644 --- a/CMake/ITKModuleKWStyleTest.cmake +++ b/CMake/ITKModuleKWStyleTest.cmake @@ -29,9 +29,9 @@ macro(itk_module_kwstyle_test _name) set(_kwstyle_itk_configuration_file "${ITK_CMAKE_DIR}/../Utilities/KWStyle/ITK.kws.xml" ) if(EXISTS "${${itk-module}_SOURCE_DIR}/ITKKWStyleOverwrite.txt") - set(_kwstyle_itk_overwrite_file "${${itk-module}_SOURCE_DIR}/ITKKWStyleOverwrite.txt" ) + set(_kwstyle_itk_overwrite_file "${${itk-module}_SOURCE_DIR}/ITKKWStyleOverwrite.txt") else() - set(_kwstyle_itk_overwrite_file "${ITK_CMAKE_DIR}/../Utilities/KWStyle/ITKOverwrite.txt" ) + set(_kwstyle_itk_overwrite_file "${ITK_CMAKE_DIR}/../Utilities/KWStyle/ITKOverwrite.txt") endif() if(EXISTS "${${itk-module}_SOURCE_DIR}/ITKKWStyleFiles.txt.in") diff --git a/CMake/ITKModuleMacros.cmake b/CMake/ITKModuleMacros.cmake index 1b052c941c3..db78805d12e 100644 --- a/CMake/ITKModuleMacros.cmake +++ b/CMake/ITKModuleMacros.cmake @@ -99,7 +99,7 @@ macro(itk_module _name) endif() endforeach() list(SORT ITK_MODULE_${itk-module}_DEPENDS) # Deterministic order. - set(ITK_MODULE_${itk-module}_PUBLIC_DEPENDS ${ITK_MODULE_${itk-module}_DEPENDS} ) + set(ITK_MODULE_${itk-module}_PUBLIC_DEPENDS ${ITK_MODULE_${itk-module}_DEPENDS}) list(APPEND ITK_MODULE_${itk-module}_DEPENDS ${ITK_MODULE_${itk-module}_COMPILE_DEPENDS} ${ITK_MODULE_${itk-module}_PRIVATE_DEPENDS} @@ -121,7 +121,7 @@ macro(itk_module _name) endmacro() macro(itk_module_check_name _name) - if( NOT "${_name}" MATCHES "^[a-zA-Z][a-zA-Z0-9]*$") + if(NOT "${_name}" MATCHES "^[a-zA-Z][a-zA-Z0-9]*$") message(FATAL_ERROR "Invalid module name: ${_name}") endif() endmacro() @@ -188,10 +188,10 @@ macro(itk_module_impl) itk_module_warnings_disable(C CXX) else() if(ITK_USE_KWSTYLE) - itk_module_kwstyle_test( ${itk-module} ) + itk_module_kwstyle_test(${itk-module}) endif() if(ITK_CPPCHECK_TEST) - itk_module_cppcheck_test( ${itk-module} ) + itk_module_cppcheck_test(${itk-module}) endif() if(EXISTS "${${itk-module}_SOURCE_DIR}/include" AND BUILD_TESTING) if("${itk-module}" MATCHES ITKGPU) @@ -211,7 +211,7 @@ macro(itk_module_impl) # Target ${itk-module} may not exist if the module only contains header files if(TARGET ${itk-module}) - if( ITK_MODULE_${itk-module}_ENABLE_SHARED ) + if(ITK_MODULE_${itk-module}_ENABLE_SHARED) if(ITK_SOURCE_DIR) set(_export_header_file "${ITKCommon_BINARY_DIR}/${itk-module}Export.h") else() @@ -223,14 +223,14 @@ macro(itk_module_impl) EXPORT_FILE_NAME ${_export_header_file} EXPORT_MACRO_NAME ${itk-module}_EXPORT NO_EXPORT_MACRO_NAME ${itk-module}_HIDDEN - STATIC_DEFINE ITK_STATIC ) + STATIC_DEFINE ITK_STATIC) install(FILES ${_export_header_file} DESTINATION ${${itk-module}_INSTALL_INCLUDE_DIR} COMPONENT Development ) endif() - if( (ITK_MODULE_${itk-module}_ENABLE_SHARED AND BUILD_SHARED_LIBS) OR (APPLE AND NOT BUILD_SHARED_LIBS) ) + if((ITK_MODULE_${itk-module}_ENABLE_SHARED AND BUILD_SHARED_LIBS) OR (APPLE AND NOT BUILD_SHARED_LIBS)) if (USE_COMPILER_HIDDEN_VISIBILITY) # Prefer to use target properties supported by newer cmake set_target_properties(${itk-module} PROPERTIES CXX_VISIBILITY_PRESET hidden) @@ -348,7 +348,7 @@ macro(itk_module_examples) endif() endif() # Adds example subdirectory - add_subdirectory( examples ) + add_subdirectory(examples) if(ITK_SOURCE_DIR) # Cleanup ITK_DIR variable that is currently pointing to the directory # containing the internal version of "ITKConfig.cmake". The clean-up could @@ -362,7 +362,7 @@ endmacro() macro(itk_module_warnings_disable) foreach(lang ${ARGN}) if(MSVC) - string(REGEX REPLACE "(^| )[/-]W[0-4]( |$)" " " + string(REGEX REPLACE "(^|)[/-]W[0-4]( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}") set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /W0") elseif(BORLAND) diff --git a/CMake/ITKModuleRemote.cmake b/CMake/ITKModuleRemote.cmake index ea787517638..4bd851b42a4 100644 --- a/CMake/ITKModuleRemote.cmake +++ b/CMake/ITKModuleRemote.cmake @@ -151,9 +151,9 @@ endfunction() # Compliance level 5 star (AKA ITK main modules, or remote modules that could become core modules) # Compliance Level 4 star (Very high-quality code, perhaps small community dependance) # Compliance Level 3 star (Quality beta code) -# Compliance Level 2 star (Alpha code feature API development or niche community/exectution environment dependance ) +# Compliance Level 2 star (Alpha code feature API development or niche community/exectution environment dependance) # Compliance Level 1 star (Pre-alpha features under development and code of unkown quality) -# Compliance Level 0 star ( Code/Feature of known poor-quality or deprecated status ) +# Compliance Level 0 star ( Code/Feature of known poor-quality or deprecated status) # [GIT_REPOSITORY url] # URL of git repo # [GIT_TAG tag] # Git branch name, commit id or tag # @@ -175,7 +175,7 @@ function(itk_fetch_module _name _description) set(Module_${_name}_REMOTE_COMPLIANCE_LEVEL ${MODULE_COMPLIANCE_LEVEL} CACHE INTERNAL "Variable to indicate the Module_${_name} compliance level") - if(NOT DEFINED Module_${_name} ) + if(NOT DEFINED Module_${_name}) option(Module_${_name} "(Remote-${MODULE_COMPLIANCE_LEVEL}) ${_description}" OFF) else() # If Module_${_name} is set manually, put its value in the CACHE @@ -218,7 +218,7 @@ function(itk_fetch_module _name _description) set(REMOTE_GIT_TAG "${_fetch_options_GIT_TAG}") - if( DEFINED Module_${_name}_GIT_TAG AND NOT "${Module_${_name}_GIT_TAG}" STREQUAL "${_fetch_options_GIT_TAG}") + if(DEFINED Module_${_name}_GIT_TAG AND NOT "${Module_${_name}_GIT_TAG}" STREQUAL "${_fetch_options_GIT_TAG}") set(REMOTE_GIT_TAG "${Module_${_name}_GIT_TAG}") message(STATUS "NOTE: Using override 'Module_${_name}_GIT_TAG=${REMOTE_GIT_TAG}'\n" " instead of value 'GIT_TAG=${_fetch_options_GIT_TAG}'\n" diff --git a/CMake/ITKModuleTest.cmake b/CMake/ITKModuleTest.cmake index f99ae6b6f3f..2af1e1dad20 100644 --- a/CMake/ITKModuleTest.cmake +++ b/CMake/ITKModuleTest.cmake @@ -117,7 +117,7 @@ function(itk_python_add_test) endif() endif() - set(options ) + set(options) set(oneValueArgs NAME) set(multiValueArgs TEST_DRIVER_ARGS COMMAND) cmake_parse_arguments(PYTHON_ADD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -181,9 +181,9 @@ function(itk_python_expression_add_test) endif() endif() - set(options ) + set(options) set(oneValueArgs NAME EXPRESSION) - set(multiValueArgs ) + set(multiValueArgs) cmake_parse_arguments(PYTHON_EXPRESSION_ADD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) itk_python_add_test(NAME ${PYTHON_EXPRESSION_ADD_TEST_NAME} @@ -193,17 +193,17 @@ endfunction() function(CreateGoogleTestDriver KIT KIT_LIBS KitTests) set(exe "${KIT}GTestDriver") - add_executable(${exe} ${KitTests} ) + add_executable(${exe} ${KitTests}) target_link_libraries(${exe} ${KIT_LIBS} GTest::GTest GTest::Main) itk_module_target_label(${exe}) include(GoogleTest) if(NOT CMAKE_CROSSCOMPILING) - gtest_discover_tests( ${exe} DISCOVERY_TIMEOUT 15 ) + gtest_discover_tests(${exe} DISCOVERY_TIMEOUT 15) else() set(_skip_dependency) - if( ITK_SKIP_GTEST_DEPENDANCY_AUTO_CHECK ) + if(ITK_SKIP_GTEST_DEPENDANCY_AUTO_CHECK) # This advanced behavior is only available through the # command line. It is intended to be used only when writing GoogleTests, # to require the developer to explicitly ask for introspection of diff --git a/CMake/ITKSetStandardCompilerFlags.cmake b/CMake/ITKSetStandardCompilerFlags.cmake index bcf6215e4c7..99f23076153 100644 --- a/CMake/ITKSetStandardCompilerFlags.cmake +++ b/CMake/ITKSetStandardCompilerFlags.cmake @@ -28,7 +28,7 @@ function(check_c_compiler_flags c_flag_var) set(local_c_flags "") set(flag_list "${ARGN}") foreach(flag IN LISTS flag_list) - string(REPLACE "=" "_" flag_var ${flag} ) + string(REPLACE "=" "_" flag_var ${flag}) check_c_compiler_flag(${flag} C_HAS_WARNING${flag_var}) if(${C_HAS_WARNING${flag_var}}) set(local_c_flags "${local_c_flags} ${flag}") @@ -42,7 +42,7 @@ function(check_cxx_compiler_flags cxx_flag_var) set(local_cxx_flags "") set(flag_list "${ARGN}") foreach(flag IN LISTS flag_list) - string(REPLACE "=" "_" flag_var ${flag} ) + string(REPLACE "=" "_" flag_var ${flag}) check_cxx_compiler_flag(${flag} CXX_HAS_WARNING${flag_var}) if(${CXX_HAS_WARNING${flag_var}}) set(local_cxx_flags "${local_cxx_flags} ${flag}") @@ -66,11 +66,11 @@ function(check_compiler_warning_flags c_warning_flags_var cxx_warning_flags_var) ## is reporting 1000's of wanings in windows ## header files, for now, limit the number of ## warnings to level 3 - if( WIN32 ) - set(VerboseWarningsFlag -W3 ) + if(WIN32) + set(VerboseWarningsFlag -W3) ## A better solution would be to use -Wall, ## and then disable warnings one by one - ## set(VerboseWarningsFlag -Wall -wd4820 -wd4682 ) + ## set(VerboseWarningsFlag -Wall -wd4820 -wd4682) else() ## with Intel compiler, the -Wall compiler options ## is reporting 1000's of remarks of trivial items @@ -84,7 +84,7 @@ function(check_compiler_warning_flags c_warning_flags_var cxx_warning_flags_var) endif() if(USING_INTEL_ICC_COMPILER) # NOTE -w2 is close to gcc's -Wall warning level, -w5 is intels -Wall warning level, and it is too verbose. - set(VerboseWarningsFlag -w2 -wd1268 -wd981 -wd383 -wd1418 -wd1419 -wd2259 -wd1572 -wd424 ) + set(VerboseWarningsFlag -w2 -wd1268 -wd981 -wd383 -wd1418 -wd1419 -wd2259 -wd1572 -wd424) #-wd424 #Needed for Intel compilers with remarki #424: extra ";" ignored #-wd383 #Needed for Intel compilers with remark #383: value copied to temporary, reference to temporary used #-wd981 #Needed for Intel compilers with remark #981: operands are evaluated in unspecified order @@ -94,7 +94,7 @@ function(check_compiler_warning_flags c_warning_flags_var cxx_warning_flags_var) #-wd2259 #Needed for Intel compilers with remark #2259: non-pointer conversion from "itk::SizeValueType={unsigned long}" to "double" may lose significant bits #-wd1268 #Needed for Intel compliers with warning #1268: support for exported templates is disabled else() - set(VerboseWarningsFlag -Wall ) + set(VerboseWarningsFlag -Wall) endif () endif() @@ -155,13 +155,13 @@ function(check_avx_flags avx_flags_var) __m256 a, b, c; const float src[8] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f }; float dst[8]; - a = _mm256_loadu_ps( src ); - b = _mm256_loadu_ps( src ); - c = _mm256_add_ps( a, b ); - _mm256_storeu_ps( dst, c ); + a = _mm256_loadu_ps(src); + b = _mm256_loadu_ps(src); + c = _mm256_add_ps(a, b); + _mm256_storeu_ps(dst, c); - for( int i = 0; i < 8; i++ ){ - if( ( src[i] + src[i] ) != dst[i] ){ + for(int i = 0; i < 8; i++){ + if(( src[i] + src[i]) != dst[i]){ return -1; } } @@ -181,13 +181,13 @@ function(check_avx_flags avx_flags_var) __m256i a, b, c; const int src[8] = { 1, 2, 3, 4, 5, 6, 7, 8 }; int dst[8]; - a = _mm256_loadu_si256( (__m256i*)src ); - b = _mm256_loadu_si256( (__m256i*)src ); - c = _mm256_add_epi32( a, b ); - _mm256_storeu_si256( (__m256i*)dst, c ); + a = _mm256_loadu_si256( (__m256i*)src); + b = _mm256_loadu_si256( (__m256i*)src); + c = _mm256_add_epi32( a, b); + _mm256_storeu_si256( (__m256i*)dst, c); - for( int i = 0; i < 8; i++ ){ - if( ( src[i] + src[i] ) != dst[i] ){ + for(int i = 0; i < 8; i++){ + if(( src[i] + src[i]) != dst[i]){ return -1; } } @@ -248,7 +248,7 @@ function(check_compiler_optimization_flags c_optimization_flags_var cxx_optimiza set(c_and_cxx_flags ${InstructionSetOptimizationFlags}) endif() - check_c_compiler_flags( CMAKE_C_WARNING_FLAGS ${c_and_cxx_flags} ${c_flags}) + check_c_compiler_flags( CMAKE_C_WARNING_FLAGS ${c_and_cxx_flags} ${c_flags}) check_cxx_compiler_flags(CMAKE_CXX_WARNING_FLAGS ${c_and_cxx_flags} ${cxx_flags}) set(${c_optimization_flags_var} "${CMAKE_C_WARNING_FLAGS}" PARENT_SCOPE) @@ -392,7 +392,7 @@ macro(check_compiler_platform_flags) endif() endmacro()#End the platform check function -if(NOT ITK_C_WARNING_FLAGS OR NOT ITK_CXX_WARNING_FLAGS ) # Only check once if not explicitly set on command line +if(NOT ITK_C_WARNING_FLAGS OR NOT ITK_CXX_WARNING_FLAGS) # Only check once if not explicitly set on command line #----------------------------------------------------------------------------- #Check the set of warning flags the compiler supports check_compiler_warning_flags(C_WARNING_FLAGS CXX_WARNING_FLAGS) @@ -414,7 +414,7 @@ unset(C_WARNING_FLAGS) unset(CXX_WARNING_FLAGS) -if(NOT ITK_C_OPTIMIZATION_FLAGS OR NOT ITK_CXX_OPTIMIZATION_FLAGS ) # Only check once if not explicitly set on command line +if(NOT ITK_C_OPTIMIZATION_FLAGS OR NOT ITK_CXX_OPTIMIZATION_FLAGS) # Only check once if not explicitly set on command line #----------------------------------------------------------------------------- #Check the set of warning flags the compiler supports check_compiler_optimization_flags(C_OPTIMIZATION_FLAGS CXX_OPTIMIZATION_FLAGS) diff --git a/CMake/ITK_CheckCCompilerFlag.cmake b/CMake/ITK_CheckCCompilerFlag.cmake index b2eaa48c44a..2697e1096f4 100644 --- a/CMake/ITK_CheckCCompilerFlag.cmake +++ b/CMake/ITK_CheckCCompilerFlag.cmake @@ -24,7 +24,7 @@ include(CheckCSourceCompiles) macro(ITK_CHECK_C_COMPILER_FLAG _FLAG _RESULT) if(ITK_LEGACY_REMOVE) - message( FATAL_ERROR "REPLACE ITK_CHECK_C_COMPILER_FLAG with check_c_compiler_flag" ) + message(FATAL_ERROR "REPLACE ITK_CHECK_C_COMPILER_FLAG with check_c_compiler_flag") endif() - check_c_compiler_flag( ${_FLAG} ${_RESULT} ) + check_c_compiler_flag(${_FLAG} ${_RESULT}) endmacro() diff --git a/CMake/ITK_CheckCXXCompilerFlag.cmake b/CMake/ITK_CheckCXXCompilerFlag.cmake index c51eab6673d..35bb374d022 100644 --- a/CMake/ITK_CheckCXXCompilerFlag.cmake +++ b/CMake/ITK_CheckCXXCompilerFlag.cmake @@ -24,7 +24,7 @@ include(CheckCXXSourceCompiles) macro(ITK_CHECK_CXX_COMPILER_FLAG _FLAG _RESULT) if(ITK_LEGACY_REMOVE) - message( FATAL_ERROR "REPLACE ITK_CHECK_CXX_COMPILER_FLAG with check_cxx_compiler_flag" ) + message(FATAL_ERROR "REPLACE ITK_CHECK_CXX_COMPILER_FLAG with check_cxx_compiler_flag") endif() - check_cxx_compiler_flag( ${_FLAG} ${_RESULT} ) + check_cxx_compiler_flag(${_FLAG} ${_RESULT}) endmacro() diff --git a/CMake/UseITK.cmake b/CMake/UseITK.cmake index fc5ef501149..23a58d502cb 100644 --- a/CMake/UseITK.cmake +++ b/CMake/UseITK.cmake @@ -50,7 +50,7 @@ foreach(_factory_name ${ITK_FACTORY_LIST}) if (_factory_name MATCHES "IO" AND ITK_NO_IO_FACTORY_REGISTER_MANAGER) - if( "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.4") + if("${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.4") message(WARNING "ITK_NO_IO_FACTORY_REGISTER_MANAGER CMake variable is " "deprecated. Use ITK_NO_${_factory_uc}_FACTORY_REGISTER_MANAGER") diff --git a/CMake/itkExternal_Eigen3.cmake b/CMake/itkExternal_Eigen3.cmake index 972d1f83e07..e6f1fd6dcec 100644 --- a/CMake/itkExternal_Eigen3.cmake +++ b/CMake/itkExternal_Eigen3.cmake @@ -15,7 +15,7 @@ if(ITK_USE_EIGEN_MPL2_ONLY) endif() if(ITK_USE_SYSTEM_EIGEN) - find_package( Eigen3 ) + find_package(Eigen3) else() # Set variables used to configure and install Eigen # _eigen3_cmake_install_prefix work also with relative CMAKE_INSTALL_PREFIX @@ -56,7 +56,7 @@ else() ERROR_VARIABLE ITKEigen3Config_STDERR ) set(ITKInternalEigen3_DIR ${_eigen3_build_dir}) - find_package( ITKInternalEigen3 ) + find_package(ITKInternalEigen3) if(NOT ITKInternalEigen3_FOUND) message(FATAL_ERROR "ITKInternalEigen3 configuration faileed\nREPORT:\n${ITKEigen3Config_STDOUT}\n${ITKEigen3Config_STDERR}") endif() diff --git a/CMake/itkExternal_FFTW.cmake b/CMake/itkExternal_FFTW.cmake index 472e1c4f13f..37594e536fc 100644 --- a/CMake/itkExternal_FFTW.cmake +++ b/CMake/itkExternal_FFTW.cmake @@ -98,7 +98,7 @@ if(NOT ITK_USE_SYSTEM_FFTW) # ) # Can not find package, it does not yet exist find_package(FFTW3f CONFIG REQUIRED) # but we know where it will eventually be! - set(FFTW3f_INCLUDE_DIRS ${FFTW_STAGED_INSTALL_PREFIX}/include ) + set(FFTW3f_INCLUDE_DIRS ${FFTW_STAGED_INSTALL_PREFIX}/include) set(FFTW3f_LIBRARY_DIRS ${FFTW_STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) set(FFTW_INCLUDE ${FFTW3_INCLUDE_DIRS}) set(FFTW_LIBDIR ${FFTW3_LIBRARY_DIRS}) @@ -149,7 +149,7 @@ if(NOT ITK_USE_SYSTEM_FFTW) # FORCE # ) # Can not find package, it does not yet exist find_package(FFTW3 CONFIG REQUIRED) - set(FFTW3_INCLUDE_DIRS ${FFTW_STAGED_INSTALL_PREFIX}/include ) + set(FFTW3_INCLUDE_DIRS ${FFTW_STAGED_INSTALL_PREFIX}/include) set(FFTW3_LIBRARY_DIRS ${FFTW_STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) set(FFTW_INCLUDE ${FFTW3_INCLUDE_DIRS}) @@ -173,5 +173,5 @@ TYPE FILE FILES \${FFTW_INC})" COMPONENT Development) else() #Search the filesystem for compatible versions - find_package( FFTW ) # Use local itk FindFFTW.config to set variables consistently both with/without USE_SYSTEM_FFTW + find_package(FFTW) # Use local itk FindFFTW.config to set variables consistently both with/without USE_SYSTEM_FFTW endif() diff --git a/CMake/itkOpenCL.cmake b/CMake/itkOpenCL.cmake index fa381524f9f..591c25f9626 100644 --- a/CMake/itkOpenCL.cmake +++ b/CMake/itkOpenCL.cmake @@ -1,7 +1,7 @@ if(ITK_USE_GPU) - find_package ( OpenCL REQUIRED ) - if ( NOT ${OPENCL_FOUND} ) - message ( FATAL "Could not find OpenCL" ) + find_package ( OpenCL REQUIRED) + if ( NOT ${OPENCL_FOUND}) + message ( FATAL "Could not find OpenCL") endif () macro(sourcefile_to_string SOURCE_FILE RESULT_CMAKE_VAR) diff --git a/CMake/itkTargetLinkLibrariesWithDynamicLookup.cmake b/CMake/itkTargetLinkLibrariesWithDynamicLookup.cmake index 98b25bef197..edb6439caa3 100644 --- a/CMake/itkTargetLinkLibrariesWithDynamicLookup.cmake +++ b/CMake/itkTargetLinkLibrariesWithDynamicLookup.cmake @@ -37,9 +37,9 @@ function(_itkCheckUndefinedSymbolsAllowed) # hash the CMAKE_FLAGS passed and check cache to know if we need to rerun string(MD5 cmake_flags_hash "${CMAKE_SHARED_LINKER_FLAGS}") - if(NOT DEFINED "${cache_var}" ) + if(NOT DEFINED "${cache_var}") unset("${VARIABLE}" CACHE) - elseif(NOT "${${cache_var}}" STREQUAL "${cmake_flags_hash}" ) + elseif(NOT "${${cache_var}}" STREQUAL "${cmake_flags_hash}") unset("${VARIABLE}" CACHE) endif() @@ -59,9 +59,9 @@ int foo(void) {return bar()+1;} ") # APPLE: the CMAKE_MACOSX_RPATH flag should be passed. if(APPLE) - set( _rpath_arg "-DCMAKE_MACOSX_RPATH='${CMAKE_MACOSX_RPATH}'" ) + set(_rpath_arg "-DCMAKE_MACOSX_RPATH='${CMAKE_MACOSX_RPATH}'") else() - set( _rpath_arg ) + set(_rpath_arg) endif() try_compile(${VARIABLE} @@ -88,9 +88,9 @@ endfunction() _itkCheckUndefinedSymbolsAllowed() -macro( itk_target_link_libraries_with_dynamic_lookup target ) - if ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) - set_target_properties( ${target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" ) +macro(itk_target_link_libraries_with_dynamic_lookup target) + if ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set_target_properties(${target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") elseif(ITK_UNDEFINED_SYMBOLS_ALLOWED) # linker allows undefined symbols, let's just not link else() diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f438b91be0..9a3bfa3cb44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ include(CMakeDependentOption) # use ExternalProject include(ExternalProject) -if( CMAKE_HOST_WIN32 ) +if(CMAKE_HOST_WIN32) if(NOT DEFINED ITK_SKIP_PATH_LENGTH_CHECKS) if(${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.14392") # Win10 version 1607 set(_LongPathKey LongPathsEnabled) @@ -87,10 +87,10 @@ if( CMAKE_HOST_WIN32 ) endif() endif() -if( CMAKE_HOST_WIN32 AND NOT ITK_SKIP_PATH_LENGTH_CHECKS ) +if(CMAKE_HOST_WIN32 AND NOT ITK_SKIP_PATH_LENGTH_CHECKS) - string( LENGTH "${CMAKE_CURRENT_SOURCE_DIR}" n ) - if( n GREATER 50 ) + string(LENGTH "${CMAKE_CURRENT_SOURCE_DIR}" n) + if(n GREATER 50) message( FATAL_ERROR "ITK source code directory path length is too long (${n} > 50)." @@ -98,8 +98,8 @@ if( CMAKE_HOST_WIN32 AND NOT ITK_SKIP_PATH_LENGTH_CHECKS ) ) endif() - string( LENGTH "${CMAKE_CURRENT_BINARY_DIR}" n ) - if( n GREATER 50 ) + string(LENGTH "${CMAKE_CURRENT_BINARY_DIR}" n) + if(n GREATER 50) message( FATAL_ERROR "ITK build directory path length is too long (${n} > 50)." @@ -367,12 +367,12 @@ set(ITK_NIFTI_IO_ANALYZE_FLAVOR "ITK4Warning" CACHE STRING ${ITK_NIFTI_IO_ANALYZ set_property(CACHE ITK_NIFTI_IO_ANALYZE_FLAVOR PROPERTY STRINGS ITK4Warning ITK4 SPM FSL Reject) -if( NOT ("${ITK_NIFTI_IO_ANALYZE_FLAVOR}" STREQUAL "ITK4Warning" OR +if(NOT ("${ITK_NIFTI_IO_ANALYZE_FLAVOR}" STREQUAL "ITK4Warning" OR "${ITK_NIFTI_IO_ANALYZE_FLAVOR}" STREQUAL "ITK4" OR "${ITK_NIFTI_IO_ANALYZE_FLAVOR}" STREQUAL "SPM" OR "${ITK_NIFTI_IO_ANALYZE_FLAVOR}" STREQUAL "FSL" OR "${ITK_NIFTI_IO_ANALYZE_FLAVOR}" STREQUAL "Reject" - ) ) + )) set(ITK_NIFTI_IO_ANALYZE_FLAVOR "ITK4Warning" CACHE STRING ${ITK_NIFTI_IO_ANALYZE_FLAVOR_DOC_STRING} FORCE) endif() mark_as_advanced(ITK_NIFTI_IO_ANALYZE_FLAVOR) @@ -464,7 +464,7 @@ option(ITK_USE_SYSTEM_FFTW "Use an installed version of FFTW" ${ITK_USE_SYSTEM_F mark_as_advanced(ITK_USE_SYSTEM_FFTW) -if( ITK_USE_FFTWD OR ITK_USE_FFTWF ) +if(ITK_USE_FFTWD OR ITK_USE_FFTWF) include(itkExternal_FFTW) # This pollutes the global namespace, but is needed for backward compatibility include_directories(${FFTW_INCLUDE}) @@ -505,12 +505,12 @@ set(ITK_EXAMPLE_DATA_ROOT "${ITK_SOURCE_DIR}/Examples/Data") # This flag is used in particular, to enable some tests that require large memory to run. # Test that have significant memory requirements should use -# "set_tests_properties( testname PROPERTIES RESOURCE_LOCK MEMORY_SIZE )", +# "set_tests_properties(testname PROPERTIES RESOURCE_LOCK MEMORY_SIZE)", # so that only 1 of the memory constrained tests is run at a time. (NOTE: Other low # memory tests that do not have the RESOURCE_LOCK requirement can be run at the same time.) # Allow for tests that may use upto 80% of the computer memory to be used for testing. cmake_host_system_information(RESULT ITK_COMPUTER_MEMORY_AVAILABLE_MB QUERY TOTAL_PHYSICAL_MEMORY) -math(EXPR EIGHTY_PERCENT_AVAILABLE_MEMORY_IN_GB "(${ITK_COMPUTER_MEMORY_AVAILABLE_MB} * 80) / ( 1024 * 100)" ) +math(EXPR EIGHTY_PERCENT_AVAILABLE_MEMORY_IN_GB "(${ITK_COMPUTER_MEMORY_AVAILABLE_MB} * 80) / ( 1024 * 100)") set(ITK_COMPUTER_MEMORY_SIZE ${EIGHTY_PERCENT_AVAILABLE_MEMORY_IN_GB} CACHE STRING "Provide here the size of your RAM in gibibytes") unset(EIGHTY_PERCENT_AVAILABLE_MEMORY_IN_GB) unset(ITK_COMPUTER_MEMORY_AVAILABLE_MB) diff --git a/Examples/DataRepresentation/Image/CMakeLists.txt b/Examples/DataRepresentation/Image/CMakeLists.txt index ff79ac2afc1..5614542585c 100644 --- a/Examples/DataRepresentation/Image/CMakeLists.txt +++ b/Examples/DataRepresentation/Image/CMakeLists.txt @@ -1,37 +1,37 @@ project(ImageExamples) -add_executable(Image1 Image1.cxx ) +add_executable(Image1 Image1.cxx) target_link_libraries(Image1 ${ITK_LIBRARIES}) -add_executable(Image2 Image2.cxx ) +add_executable(Image2 Image2.cxx) target_link_libraries(Image2 ${ITK_LIBRARIES}) -add_executable(Image3 Image3.cxx ) +add_executable(Image3 Image3.cxx) target_link_libraries(Image3 ${ITK_LIBRARIES}) -add_executable(Image4 Image4.cxx ) +add_executable(Image4 Image4.cxx) target_link_libraries(Image4 ${ITK_LIBRARIES}) -add_executable(VectorImage VectorImage.cxx ) +add_executable(VectorImage VectorImage.cxx) target_link_libraries(VectorImage ${ITK_LIBRARIES}) -add_executable(ImageAdaptor2 ImageAdaptor2.cxx ) +add_executable(ImageAdaptor2 ImageAdaptor2.cxx) target_link_libraries(ImageAdaptor2 ${ITK_LIBRARIES}) -add_executable(ImageAdaptor3 ImageAdaptor3.cxx ) +add_executable(ImageAdaptor3 ImageAdaptor3.cxx) target_link_libraries(ImageAdaptor3 ${ITK_LIBRARIES}) -add_executable(ImageAdaptor4 ImageAdaptor4.cxx ) +add_executable(ImageAdaptor4 ImageAdaptor4.cxx) target_link_libraries(ImageAdaptor4 ${ITK_LIBRARIES}) -add_executable(Image5 Image5.cxx ) +add_executable(Image5 Image5.cxx) target_link_libraries(Image5 ${ITK_LIBRARIES}) -add_executable(ImageAdaptor1 ImageAdaptor1.cxx ) +add_executable(ImageAdaptor1 ImageAdaptor1.cxx) target_link_libraries(ImageAdaptor1 ${ITK_LIBRARIES}) -add_executable(RGBImage RGBImage.cxx ) +add_executable(RGBImage RGBImage.cxx) target_link_libraries(RGBImage ${ITK_LIBRARIES}) diff --git a/Examples/DataRepresentation/Mesh/CMakeLists.txt b/Examples/DataRepresentation/Mesh/CMakeLists.txt index a9f07e0e778..4dc1e80625f 100644 --- a/Examples/DataRepresentation/Mesh/CMakeLists.txt +++ b/Examples/DataRepresentation/Mesh/CMakeLists.txt @@ -1,54 +1,54 @@ project(MeshExamples) -add_executable(PointSet1 PointSet1.cxx ) +add_executable(PointSet1 PointSet1.cxx) target_link_libraries(PointSet1 ${ITK_LIBRARIES}) -add_executable(PointSet2 PointSet2.cxx ) +add_executable(PointSet2 PointSet2.cxx) target_link_libraries(PointSet2 ${ITK_LIBRARIES}) -add_executable(PointSet3 PointSet3.cxx ) +add_executable(PointSet3 PointSet3.cxx) target_link_libraries(PointSet3 ${ITK_LIBRARIES}) -add_executable(RGBPointSet RGBPointSet.cxx ) +add_executable(RGBPointSet RGBPointSet.cxx) target_link_libraries(RGBPointSet ${ITK_LIBRARIES}) -add_executable(PointSetWithVectors PointSetWithVectors.cxx ) +add_executable(PointSetWithVectors PointSetWithVectors.cxx) target_link_libraries(PointSetWithVectors ${ITK_LIBRARIES}) -add_executable(PointSetWithCovariantVectors PointSetWithCovariantVectors.cxx ) +add_executable(PointSetWithCovariantVectors PointSetWithCovariantVectors.cxx) target_link_libraries(PointSetWithCovariantVectors ${ITK_LIBRARIES}) -add_executable(Mesh1 Mesh1.cxx ) +add_executable(Mesh1 Mesh1.cxx) target_link_libraries(Mesh1 ${ITK_LIBRARIES}) -add_executable(Mesh2 Mesh2.cxx ) +add_executable(Mesh2 Mesh2.cxx) target_link_libraries(Mesh2 ${ITK_LIBRARIES}) -add_executable(Mesh3 Mesh3.cxx ) +add_executable(Mesh3 Mesh3.cxx) target_link_libraries(Mesh3 ${ITK_LIBRARIES}) -add_executable(MeshTraits MeshTraits.cxx ) +add_executable(MeshTraits MeshTraits.cxx) target_link_libraries(MeshTraits ${ITK_LIBRARIES}) -add_executable(MeshKComplex MeshKComplex.cxx ) +add_executable(MeshKComplex MeshKComplex.cxx) target_link_libraries(MeshKComplex ${ITK_LIBRARIES}) -add_executable(MeshPolyLine MeshPolyLine.cxx ) +add_executable(MeshPolyLine MeshPolyLine.cxx) target_link_libraries(MeshPolyLine ${ITK_LIBRARIES}) -add_executable(MeshCellsIteration MeshCellsIteration.cxx ) +add_executable(MeshCellsIteration MeshCellsIteration.cxx) target_link_libraries(MeshCellsIteration ${ITK_LIBRARIES}) -add_executable(MeshCellVisitor MeshCellVisitor.cxx ) +add_executable(MeshCellVisitor MeshCellVisitor.cxx) target_link_libraries(MeshCellVisitor ${ITK_LIBRARIES}) -add_executable(MeshCellVisitor2 MeshCellVisitor2.cxx ) +add_executable(MeshCellVisitor2 MeshCellVisitor2.cxx) target_link_libraries(MeshCellVisitor2 ${ITK_LIBRARIES}) -add_executable(AutomaticMesh AutomaticMesh.cxx ) +add_executable(AutomaticMesh AutomaticMesh.cxx) target_link_libraries(AutomaticMesh ${ITK_LIBRARIES}) -add_executable(ImageToPointSet ImageToPointSet.cxx ) +add_executable(ImageToPointSet ImageToPointSet.cxx) target_link_libraries(ImageToPointSet ${ITK_LIBRARIES}) diff --git a/Examples/DataRepresentation/Path/CMakeLists.txt b/Examples/DataRepresentation/Path/CMakeLists.txt index 997c8ed2ff0..81a77d65e39 100644 --- a/Examples/DataRepresentation/Path/CMakeLists.txt +++ b/Examples/DataRepresentation/Path/CMakeLists.txt @@ -1,6 +1,6 @@ project(PathExamples) -add_executable(PolyLineParametricPath1 PolyLineParametricPath1.cxx ) +add_executable(PolyLineParametricPath1 PolyLineParametricPath1.cxx) target_link_libraries(PolyLineParametricPath1 ${ITK_LIBRARIES}) if(BUILD_TESTING) diff --git a/Examples/Filtering/CMakeLists.txt b/Examples/Filtering/CMakeLists.txt index 6680705e87b..9a731edfc4e 100644 --- a/Examples/Filtering/CMakeLists.txt +++ b/Examples/Filtering/CMakeLists.txt @@ -1,154 +1,154 @@ project(FilteringExamples) -add_executable(CompositeFilterExample CompositeFilterExample.cxx ) +add_executable(CompositeFilterExample CompositeFilterExample.cxx) target_link_libraries(CompositeFilterExample ${ITK_LIBRARIES}) -add_executable(FlipImageFilter FlipImageFilter.cxx ) +add_executable(FlipImageFilter FlipImageFilter.cxx) target_link_libraries(FlipImageFilter ${ITK_LIBRARIES}) -add_executable(FFTImageFilter FFTImageFilter.cxx ) +add_executable(FFTImageFilter FFTImageFilter.cxx) target_link_libraries(FFTImageFilter ${ITK_LIBRARIES}) -if( ITK_USE_FFTWF ) - add_executable(FFTDirectInverse2 FFTDirectInverse2.cxx ) +if(ITK_USE_FFTWF) + add_executable(FFTDirectInverse2 FFTDirectInverse2.cxx) target_link_libraries(FFTDirectInverse2 ${ITK_LIBRARIES}) endif() -add_executable(GradientMagnitudeImageFilter GradientMagnitudeImageFilter.cxx ) +add_executable(GradientMagnitudeImageFilter GradientMagnitudeImageFilter.cxx) target_link_libraries(GradientMagnitudeImageFilter ${ITK_LIBRARIES}) -add_executable(GradientMagnitudeRecursiveGaussianImageFilter GradientMagnitudeRecursiveGaussianImageFilter.cxx ) +add_executable(GradientMagnitudeRecursiveGaussianImageFilter GradientMagnitudeRecursiveGaussianImageFilter.cxx) target_link_libraries(GradientMagnitudeRecursiveGaussianImageFilter ${ITK_LIBRARIES}) -add_executable(GradientRecursiveGaussianImageFilter GradientRecursiveGaussianImageFilter.cxx ) +add_executable(GradientRecursiveGaussianImageFilter GradientRecursiveGaussianImageFilter.cxx) target_link_libraries(GradientRecursiveGaussianImageFilter ${ITK_LIBRARIES}) -add_executable(GrayscaleFunctionDilateImageFilter GrayscaleFunctionDilateImageFilter.cxx ) +add_executable(GrayscaleFunctionDilateImageFilter GrayscaleFunctionDilateImageFilter.cxx) target_link_libraries(GrayscaleFunctionDilateImageFilter ${ITK_LIBRARIES}) -add_executable(BinaryThresholdImageFilter BinaryThresholdImageFilter.cxx ) +add_executable(BinaryThresholdImageFilter BinaryThresholdImageFilter.cxx) target_link_libraries(BinaryThresholdImageFilter ${ITK_LIBRARIES}) -add_executable(BinaryMedianImageFilter BinaryMedianImageFilter.cxx ) +add_executable(BinaryMedianImageFilter BinaryMedianImageFilter.cxx) target_link_libraries(BinaryMedianImageFilter ${ITK_LIBRARIES}) -add_executable(OtsuThresholdImageFilter OtsuThresholdImageFilter.cxx ) +add_executable(OtsuThresholdImageFilter OtsuThresholdImageFilter.cxx) target_link_libraries(OtsuThresholdImageFilter ${ITK_LIBRARIES}) -add_executable(OtsuMultipleThresholdImageFilter OtsuMultipleThresholdImageFilter.cxx ) +add_executable(OtsuMultipleThresholdImageFilter OtsuMultipleThresholdImageFilter.cxx) target_link_libraries(OtsuMultipleThresholdImageFilter ${ITK_LIBRARIES}) -add_executable(ThresholdImageFilter ThresholdImageFilter.cxx ) +add_executable(ThresholdImageFilter ThresholdImageFilter.cxx) target_link_libraries(ThresholdImageFilter ${ITK_LIBRARIES}) -add_executable(CastingImageFilters CastingImageFilters.cxx ) +add_executable(CastingImageFilters CastingImageFilters.cxx) target_link_libraries(CastingImageFilters ${ITK_LIBRARIES}) -add_executable(CannyEdgeDetectionImageFilter CannyEdgeDetectionImageFilter.cxx ) +add_executable(CannyEdgeDetectionImageFilter CannyEdgeDetectionImageFilter.cxx) target_link_libraries(CannyEdgeDetectionImageFilter ${ITK_LIBRARIES}) -add_executable(MedianImageFilter MedianImageFilter.cxx ) +add_executable(MedianImageFilter MedianImageFilter.cxx) target_link_libraries(MedianImageFilter ${ITK_LIBRARIES}) -add_executable(MeanImageFilter MeanImageFilter.cxx ) +add_executable(MeanImageFilter MeanImageFilter.cxx) target_link_libraries(MeanImageFilter ${ITK_LIBRARIES}) -add_executable(MathematicalMorphologyBinaryFilters MathematicalMorphologyBinaryFilters.cxx ) +add_executable(MathematicalMorphologyBinaryFilters MathematicalMorphologyBinaryFilters.cxx) target_link_libraries(MathematicalMorphologyBinaryFilters ${ITK_LIBRARIES}) -add_executable(MathematicalMorphologyGrayscaleFilters MathematicalMorphologyGrayscaleFilters.cxx ) +add_executable(MathematicalMorphologyGrayscaleFilters MathematicalMorphologyGrayscaleFilters.cxx) target_link_libraries(MathematicalMorphologyGrayscaleFilters ${ITK_LIBRARIES}) -add_executable(BinaryMinMaxCurvatureFlowImageFilter BinaryMinMaxCurvatureFlowImageFilter.cxx ) +add_executable(BinaryMinMaxCurvatureFlowImageFilter BinaryMinMaxCurvatureFlowImageFilter.cxx) target_link_libraries(BinaryMinMaxCurvatureFlowImageFilter ${ITK_LIBRARIES}) -add_executable(DiscreteGaussianImageFilter DiscreteGaussianImageFilter.cxx ) +add_executable(DiscreteGaussianImageFilter DiscreteGaussianImageFilter.cxx) target_link_libraries(DiscreteGaussianImageFilter ${ITK_LIBRARIES}) -add_executable(GaussianBlurImageFunction GaussianBlurImageFunction.cxx ) +add_executable(GaussianBlurImageFunction GaussianBlurImageFunction.cxx) target_link_libraries(GaussianBlurImageFunction ${ITK_LIBRARIES}) -add_executable(LaplacianRecursiveGaussianImageFilter1 LaplacianRecursiveGaussianImageFilter1.cxx ) +add_executable(LaplacianRecursiveGaussianImageFilter1 LaplacianRecursiveGaussianImageFilter1.cxx) target_link_libraries(LaplacianRecursiveGaussianImageFilter1 ${ITK_LIBRARIES}) -add_executable(ScaleSpaceGenerator2D ScaleSpaceGenerator2D.cxx ) +add_executable(ScaleSpaceGenerator2D ScaleSpaceGenerator2D.cxx) target_link_libraries(ScaleSpaceGenerator2D ${ITK_LIBRARIES}) -add_executable(BinomialBlurImageFilter BinomialBlurImageFilter.cxx ) +add_executable(BinomialBlurImageFilter BinomialBlurImageFilter.cxx) target_link_libraries(BinomialBlurImageFilter ${ITK_LIBRARIES}) -add_executable(CurvatureAnisotropicDiffusionImageFilter CurvatureAnisotropicDiffusionImageFilter.cxx ) +add_executable(CurvatureAnisotropicDiffusionImageFilter CurvatureAnisotropicDiffusionImageFilter.cxx) target_link_libraries(CurvatureAnisotropicDiffusionImageFilter ${ITK_LIBRARIES}) -add_executable(VectorGradientAnisotropicDiffusionImageFilter VectorGradientAnisotropicDiffusionImageFilter.cxx ) +add_executable(VectorGradientAnisotropicDiffusionImageFilter VectorGradientAnisotropicDiffusionImageFilter.cxx) target_link_libraries(VectorGradientAnisotropicDiffusionImageFilter ${ITK_LIBRARIES}) -add_executable(VectorCurvatureAnisotropicDiffusionImageFilter VectorCurvatureAnisotropicDiffusionImageFilter.cxx ) +add_executable(VectorCurvatureAnisotropicDiffusionImageFilter VectorCurvatureAnisotropicDiffusionImageFilter.cxx) target_link_libraries(VectorCurvatureAnisotropicDiffusionImageFilter ${ITK_LIBRARIES}) -add_executable(RGBToGrayscale RGBToGrayscale.cxx ) +add_executable(RGBToGrayscale RGBToGrayscale.cxx) target_link_libraries(RGBToGrayscale ${ITK_LIBRARIES}) -add_executable(BilateralImageFilter BilateralImageFilter.cxx ) +add_executable(BilateralImageFilter BilateralImageFilter.cxx) target_link_libraries(BilateralImageFilter ${ITK_LIBRARIES}) -add_executable(ResampleOrientedImageFilter ResampleOrientedImageFilter.cxx ) +add_executable(ResampleOrientedImageFilter ResampleOrientedImageFilter.cxx) target_link_libraries(ResampleOrientedImageFilter ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter2 ResampleImageFilter2.cxx ) +add_executable(ResampleImageFilter2 ResampleImageFilter2.cxx) target_link_libraries(ResampleImageFilter2 ${ITK_LIBRARIES}) -add_executable(GradientAnisotropicDiffusionImageFilter GradientAnisotropicDiffusionImageFilter.cxx ) +add_executable(GradientAnisotropicDiffusionImageFilter GradientAnisotropicDiffusionImageFilter.cxx) target_link_libraries(GradientAnisotropicDiffusionImageFilter ${ITK_LIBRARIES}) -add_executable(CurvatureFlowImageFilter CurvatureFlowImageFilter.cxx ) +add_executable(CurvatureFlowImageFilter CurvatureFlowImageFilter.cxx) target_link_libraries(CurvatureFlowImageFilter ${ITK_LIBRARIES}) -add_executable(GradientVectorFlowImageFilter GradientVectorFlowImageFilter.cxx ) +add_executable(GradientVectorFlowImageFilter GradientVectorFlowImageFilter.cxx) target_link_libraries(GradientVectorFlowImageFilter ${ITK_LIBRARIES}) -add_executable(SigmoidImageFilter SigmoidImageFilter.cxx ) +add_executable(SigmoidImageFilter SigmoidImageFilter.cxx) target_link_libraries(SigmoidImageFilter ${ITK_LIBRARIES}) -add_executable(RGBCurvatureAnisotropicDiffusionImageFilter RGBCurvatureAnisotropicDiffusionImageFilter.cxx ) +add_executable(RGBCurvatureAnisotropicDiffusionImageFilter RGBCurvatureAnisotropicDiffusionImageFilter.cxx) target_link_libraries(RGBCurvatureAnisotropicDiffusionImageFilter ${ITK_LIBRARIES}) -add_executable(RGBGradientAnisotropicDiffusionImageFilter RGBGradientAnisotropicDiffusionImageFilter.cxx ) +add_executable(RGBGradientAnisotropicDiffusionImageFilter RGBGradientAnisotropicDiffusionImageFilter.cxx) target_link_libraries(RGBGradientAnisotropicDiffusionImageFilter ${ITK_LIBRARIES}) -add_executable(SignedDanielssonDistanceMapImageFilter SignedDanielssonDistanceMapImageFilter.cxx ) +add_executable(SignedDanielssonDistanceMapImageFilter SignedDanielssonDistanceMapImageFilter.cxx) target_link_libraries(SignedDanielssonDistanceMapImageFilter ${ITK_LIBRARIES}) -add_executable(SecondDerivativeRecursiveGaussianImageFilter SecondDerivativeRecursiveGaussianImageFilter.cxx ) +add_executable(SecondDerivativeRecursiveGaussianImageFilter SecondDerivativeRecursiveGaussianImageFilter.cxx) target_link_libraries(SecondDerivativeRecursiveGaussianImageFilter ${ITK_LIBRARIES}) -add_executable(DerivativeImageFilter DerivativeImageFilter.cxx ) +add_executable(DerivativeImageFilter DerivativeImageFilter.cxx) target_link_libraries(DerivativeImageFilter ${ITK_LIBRARIES}) -add_executable(DanielssonDistanceMapImageFilter DanielssonDistanceMapImageFilter.cxx ) +add_executable(DanielssonDistanceMapImageFilter DanielssonDistanceMapImageFilter.cxx) target_link_libraries(DanielssonDistanceMapImageFilter ${ITK_LIBRARIES}) -add_executable(AntiAliasBinaryImageFilter AntiAliasBinaryImageFilter.cxx ) +add_executable(AntiAliasBinaryImageFilter AntiAliasBinaryImageFilter.cxx) target_link_libraries(AntiAliasBinaryImageFilter ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter ResampleImageFilter.cxx ) +add_executable(ResampleImageFilter ResampleImageFilter.cxx) target_link_libraries(ResampleImageFilter ${ITK_LIBRARIES}) -add_executable(SmoothingRecursiveGaussianImageFilter SmoothingRecursiveGaussianImageFilter.cxx ) +add_executable(SmoothingRecursiveGaussianImageFilter SmoothingRecursiveGaussianImageFilter.cxx) target_link_libraries(SmoothingRecursiveGaussianImageFilter ${ITK_LIBRARIES}) -add_executable(SmoothingRecursiveGaussianImageFilter2 SmoothingRecursiveGaussianImageFilter2.cxx ) +add_executable(SmoothingRecursiveGaussianImageFilter2 SmoothingRecursiveGaussianImageFilter2.cxx) target_link_libraries(SmoothingRecursiveGaussianImageFilter2 ${ITK_LIBRARIES}) -add_executable(LaplacianRecursiveGaussianImageFilter2 LaplacianRecursiveGaussianImageFilter2.cxx ) +add_executable(LaplacianRecursiveGaussianImageFilter2 LaplacianRecursiveGaussianImageFilter2.cxx) target_link_libraries(LaplacianRecursiveGaussianImageFilter2 ${ITK_LIBRARIES}) -add_executable(MorphologicalImageEnhancement MorphologicalImageEnhancement.cxx ) +add_executable(MorphologicalImageEnhancement MorphologicalImageEnhancement.cxx) target_link_libraries(MorphologicalImageEnhancement ${ITK_LIBRARIES}) -add_executable(MinMaxCurvatureFlowImageFilter MinMaxCurvatureFlowImageFilter.cxx ) +add_executable(MinMaxCurvatureFlowImageFilter MinMaxCurvatureFlowImageFilter.cxx) target_link_libraries(MinMaxCurvatureFlowImageFilter ${ITK_LIBRARIES}) -add_executable(FFTImageFilterFourierDomainFiltering FFTImageFilterFourierDomainFiltering.cxx ) +add_executable(FFTImageFilterFourierDomainFiltering FFTImageFilterFourierDomainFiltering.cxx) target_link_libraries(FFTImageFilterFourierDomainFiltering ${ITK_LIBRARIES}) -add_executable(LaplacianImageFilter LaplacianImageFilter.cxx ) +add_executable(LaplacianImageFilter LaplacianImageFilter.cxx) target_link_libraries(LaplacianImageFilter ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter3 ResampleImageFilter3.cxx ) +add_executable(ResampleImageFilter3 ResampleImageFilter3.cxx) target_link_libraries(ResampleImageFilter3 ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter4 ResampleImageFilter4.cxx ) +add_executable(ResampleImageFilter4 ResampleImageFilter4.cxx) target_link_libraries(ResampleImageFilter4 ${ITK_LIBRARIES}) -add_executable(VotingBinaryHoleFillingImageFilter VotingBinaryHoleFillingImageFilter.cxx ) +add_executable(VotingBinaryHoleFillingImageFilter VotingBinaryHoleFillingImageFilter.cxx) target_link_libraries(VotingBinaryHoleFillingImageFilter ${ITK_LIBRARIES}) -add_executable(VotingBinaryIterativeHoleFillingImageFilter VotingBinaryIterativeHoleFillingImageFilter.cxx ) +add_executable(VotingBinaryIterativeHoleFillingImageFilter VotingBinaryIterativeHoleFillingImageFilter.cxx) target_link_libraries(VotingBinaryIterativeHoleFillingImageFilter ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter5 ResampleImageFilter5.cxx ) +add_executable(ResampleImageFilter5 ResampleImageFilter5.cxx) target_link_libraries(ResampleImageFilter5 ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter6 ResampleImageFilter6.cxx ) +add_executable(ResampleImageFilter6 ResampleImageFilter6.cxx) target_link_libraries(ResampleImageFilter6 ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter8 ResampleImageFilter8.cxx ) +add_executable(ResampleImageFilter8 ResampleImageFilter8.cxx) target_link_libraries(ResampleImageFilter8 ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter9 ResampleImageFilter9.cxx ) +add_executable(ResampleImageFilter9 ResampleImageFilter9.cxx) target_link_libraries(ResampleImageFilter9 ${ITK_LIBRARIES}) -add_executable(ResampleVolumesToBeIsotropic ResampleVolumesToBeIsotropic.cxx ) +add_executable(ResampleVolumesToBeIsotropic ResampleVolumesToBeIsotropic.cxx) target_link_libraries(ResampleVolumesToBeIsotropic ${ITK_LIBRARIES}) -add_executable(SubsampleVolume SubsampleVolume.cxx ) +add_executable(SubsampleVolume SubsampleVolume.cxx) target_link_libraries(SubsampleVolume ${ITK_LIBRARIES}) -add_executable(SpatialObjectToImage1 SpatialObjectToImage1.cxx ) +add_executable(SpatialObjectToImage1 SpatialObjectToImage1.cxx) target_link_libraries(SpatialObjectToImage1 ${ITK_LIBRARIES}) -add_executable(SpatialObjectToImage2 SpatialObjectToImage2.cxx ) +add_executable(SpatialObjectToImage2 SpatialObjectToImage2.cxx) target_link_libraries(SpatialObjectToImage2 ${ITK_LIBRARIES}) -add_executable(SpatialObjectToImage3 SpatialObjectToImage3.cxx ) +add_executable(SpatialObjectToImage3 SpatialObjectToImage3.cxx) target_link_libraries(SpatialObjectToImage3 ${ITK_LIBRARIES}) -add_executable(LaplacianSharpeningImageFilter LaplacianSharpeningImageFilter.cxx ) +add_executable(LaplacianSharpeningImageFilter LaplacianSharpeningImageFilter.cxx) target_link_libraries(LaplacianSharpeningImageFilter ${ITK_LIBRARIES}) -add_executable(VectorIndexSelection VectorIndexSelection.cxx ) +add_executable(VectorIndexSelection VectorIndexSelection.cxx) target_link_libraries(VectorIndexSelection ${ITK_LIBRARIES}) -add_executable(VesselnessMeasureImageFilter VesselnessMeasureImageFilter.cxx ) +add_executable(VesselnessMeasureImageFilter VesselnessMeasureImageFilter.cxx) target_link_libraries(VesselnessMeasureImageFilter ${ITK_LIBRARIES}) add_executable(DiffusionTensor3DReconstructionImageFilter DiffusionTensor3DReconstructionImageFilter.cxx) target_link_libraries(DiffusionTensor3DReconstructionImageFilter ${ITK_LIBRARIES}) -add_executable(FFTDirectInverse FFTDirectInverse.cxx ) +add_executable(FFTDirectInverse FFTDirectInverse.cxx) target_link_libraries(FFTDirectInverse ${ITK_LIBRARIES}) -add_executable(ZeroCrossingBasedEdgeDetectionImageFilter ZeroCrossingBasedEdgeDetectionImageFilter.cxx ) +add_executable(ZeroCrossingBasedEdgeDetectionImageFilter ZeroCrossingBasedEdgeDetectionImageFilter.cxx) target_link_libraries(ZeroCrossingBasedEdgeDetectionImageFilter ${ITK_LIBRARIES}) -add_executable(WarpImageFilter1 WarpImageFilter1.cxx ) +add_executable(WarpImageFilter1 WarpImageFilter1.cxx) target_link_libraries(WarpImageFilter1 ${ITK_LIBRARIES}) -add_executable(SurfaceExtraction SurfaceExtraction.cxx ) +add_executable(SurfaceExtraction SurfaceExtraction.cxx) target_link_libraries(SurfaceExtraction ${ITK_LIBRARIES}) -add_executable(DigitallyReconstructedRadiograph1 DigitallyReconstructedRadiograph1.cxx ) +add_executable(DigitallyReconstructedRadiograph1 DigitallyReconstructedRadiograph1.cxx) target_link_libraries(DigitallyReconstructedRadiograph1 ${ITK_LIBRARIES}) -add_executable(ResampleImageFilter7 ResampleImageFilter7.cxx ) +add_executable(ResampleImageFilter7 ResampleImageFilter7.cxx) target_link_libraries(ResampleImageFilter7 ${ITK_LIBRARIES}) if(BUILD_TESTING) diff --git a/Examples/Filtering/test/CMakeLists.txt b/Examples/Filtering/test/CMakeLists.txt index e87a0565cd0..572c1b477af 100644 --- a/Examples/Filtering/test/CMakeLists.txt +++ b/Examples/Filtering/test/CMakeLists.txt @@ -181,7 +181,7 @@ itk_add_test(NAME GradientVectorFlowImageFilterTest COMMAND ${ITK_TEST_DRIVER} 5 # number of iterations 2000.0 # noise level ) -set_tests_properties( GradientVectorFlowImageFilterTest +set_tests_properties(GradientVectorFlowImageFilterTest PROPERTIES DEPENDS GradientRecursiveGaussianImageFilterTest) itk_add_test(NAME DerivativeImageFilterTest COMMAND ${ITK_TEST_DRIVER} --compare DATA{${BASELINE}/DerivativeImageFilter.mha} @@ -555,7 +555,7 @@ itk_add_test(NAME FFTDirectInverseTest COMMAND ${ITK_TEST_DRIVER} ${ITK_SOURCE_DIR}/Examples/Data/Point.png ${TEMP}/FFTDirectInversePoint.png ) -if( ITK_USE_FFTWF ) +if(ITK_USE_FFTWF) #DATA{${BASELINE}/FFTDirectInverse2Point.png} itk_add_test(NAME FFTDirectInverse2Test COMMAND ${ITK_TEST_DRIVER} --compare ${ITK_SOURCE_DIR}/Examples/Data/Point.png diff --git a/Examples/IO/CMakeLists.txt b/Examples/IO/CMakeLists.txt index d429d8ecef0..4a09ecd997c 100644 --- a/Examples/IO/CMakeLists.txt +++ b/Examples/IO/CMakeLists.txt @@ -1,87 +1,87 @@ project(IOExamples) -add_executable(ImageReadWrite ImageReadWrite.cxx ) +add_executable(ImageReadWrite ImageReadWrite.cxx) target_link_libraries(ImageReadWrite ${ITK_LIBRARIES}) -add_executable(ImageReadCastWrite ImageReadCastWrite.cxx ) +add_executable(ImageReadCastWrite ImageReadCastWrite.cxx) target_link_libraries(ImageReadCastWrite ${ITK_LIBRARIES}) -add_executable(ImageReadExtractFilterInsertWrite ImageReadExtractFilterInsertWrite.cxx ) +add_executable(ImageReadExtractFilterInsertWrite ImageReadExtractFilterInsertWrite.cxx) target_link_libraries(ImageReadExtractFilterInsertWrite ${ITK_LIBRARIES}) -add_executable(ImageReadRegionOfInterestWrite ImageReadRegionOfInterestWrite.cxx ) +add_executable(ImageReadRegionOfInterestWrite ImageReadRegionOfInterestWrite.cxx) target_link_libraries(ImageReadRegionOfInterestWrite ${ITK_LIBRARIES}) -add_executable(RGBImageReadWrite RGBImageReadWrite.cxx ) +add_executable(RGBImageReadWrite RGBImageReadWrite.cxx) target_link_libraries(RGBImageReadWrite ${ITK_LIBRARIES}) -add_executable(CovariantVectorImageRead CovariantVectorImageRead.cxx ) +add_executable(CovariantVectorImageRead CovariantVectorImageRead.cxx) target_link_libraries(CovariantVectorImageRead ${ITK_LIBRARIES}) -add_executable(CovariantVectorImageExtractComponent CovariantVectorImageExtractComponent.cxx ) +add_executable(CovariantVectorImageExtractComponent CovariantVectorImageExtractComponent.cxx) target_link_libraries(CovariantVectorImageExtractComponent ${ITK_LIBRARIES}) -add_executable(VectorImageReadWrite VectorImageReadWrite.cxx ) +add_executable(VectorImageReadWrite VectorImageReadWrite.cxx) target_link_libraries(VectorImageReadWrite ${ITK_LIBRARIES}) -add_executable(ComplexImageReadWrite ComplexImageReadWrite.cxx ) +add_executable(ComplexImageReadWrite ComplexImageReadWrite.cxx) target_link_libraries(ComplexImageReadWrite ${ITK_LIBRARIES}) -add_executable(ImageReadExportVTK ImageReadExportVTK.cxx ) +add_executable(ImageReadExportVTK ImageReadExportVTK.cxx) target_link_libraries(ImageReadExportVTK ${ITK_LIBRARIES}) -add_executable(RGBImageSeriesReadWrite RGBImageSeriesReadWrite.cxx ) +add_executable(RGBImageSeriesReadWrite RGBImageSeriesReadWrite.cxx) target_link_libraries(RGBImageSeriesReadWrite ${ITK_LIBRARIES}) -add_executable(ImageSeriesReadWrite ImageSeriesReadWrite.cxx ) +add_executable(ImageSeriesReadWrite ImageSeriesReadWrite.cxx) target_link_libraries(ImageSeriesReadWrite ${ITK_LIBRARIES}) -add_executable(ImageSeriesReadWrite2 ImageSeriesReadWrite2.cxx ) +add_executable(ImageSeriesReadWrite2 ImageSeriesReadWrite2.cxx) target_link_libraries(ImageSeriesReadWrite2 ${ITK_LIBRARIES}) -add_executable(ImageReadImageSeriesWrite ImageReadImageSeriesWrite.cxx ) +add_executable(ImageReadImageSeriesWrite ImageReadImageSeriesWrite.cxx) target_link_libraries(ImageReadImageSeriesWrite ${ITK_LIBRARIES}) -add_executable(DicomSeriesReadImageWrite2 DicomSeriesReadImageWrite2.cxx ) +add_executable(DicomSeriesReadImageWrite2 DicomSeriesReadImageWrite2.cxx) target_link_libraries(DicomSeriesReadImageWrite2 ${ITK_LIBRARIES}) -add_executable(DicomSeriesReadGaussianImageWrite DicomSeriesReadGaussianImageWrite.cxx ) +add_executable(DicomSeriesReadGaussianImageWrite DicomSeriesReadGaussianImageWrite.cxx) target_link_libraries(DicomSeriesReadGaussianImageWrite ${ITK_LIBRARIES}) -add_executable(DicomSeriesReadPrintTags DicomSeriesReadPrintTags.cxx ) +add_executable(DicomSeriesReadPrintTags DicomSeriesReadPrintTags.cxx) target_link_libraries(DicomSeriesReadPrintTags ${ITK_LIBRARIES}) -add_executable(DicomImageReadPrintTags DicomImageReadPrintTags.cxx ) +add_executable(DicomImageReadPrintTags DicomImageReadPrintTags.cxx) target_link_libraries(DicomImageReadPrintTags ${ITK_LIBRARIES}) -add_executable(DicomImageReadWrite DicomImageReadWrite.cxx ) +add_executable(DicomImageReadWrite DicomImageReadWrite.cxx) target_link_libraries(DicomImageReadWrite ${ITK_LIBRARIES}) -add_executable(ImageReadDicomSeriesWrite ImageReadDicomSeriesWrite.cxx ) +add_executable(ImageReadDicomSeriesWrite ImageReadDicomSeriesWrite.cxx) target_link_libraries(ImageReadDicomSeriesWrite ${ITK_LIBRARIES}) -add_executable(DicomImageReadChangeHeaderWrite DicomImageReadChangeHeaderWrite.cxx ) +add_executable(DicomImageReadChangeHeaderWrite DicomImageReadChangeHeaderWrite.cxx) target_link_libraries(DicomImageReadChangeHeaderWrite ${ITK_LIBRARIES}) -add_executable(DicomSeriesReadSeriesWrite DicomSeriesReadSeriesWrite.cxx ) +add_executable(DicomSeriesReadSeriesWrite DicomSeriesReadSeriesWrite.cxx) target_link_libraries(DicomSeriesReadSeriesWrite ${ITK_LIBRARIES}) -add_executable(DicomPrintPatientInformation DicomPrintPatientInformation.cxx ) +add_executable(DicomPrintPatientInformation DicomPrintPatientInformation.cxx) target_link_libraries(DicomPrintPatientInformation ${ITK_LIBRARIES}) -add_executable(TransformReadWrite TransformReadWrite.cxx ) +add_executable(TransformReadWrite TransformReadWrite.cxx) target_link_libraries(TransformReadWrite ${ITK_LIBRARIES}) -add_executable(VisibleHumanStreamReadWrite VisibleHumanStreamReadWrite.cxx ) +add_executable(VisibleHumanStreamReadWrite VisibleHumanStreamReadWrite.cxx) target_link_libraries(VisibleHumanStreamReadWrite ${ITK_LIBRARIES}) -add_executable(VisibleHumanPasteWrite VisibleHumanPasteWrite.cxx ) +add_executable(VisibleHumanPasteWrite VisibleHumanPasteWrite.cxx) target_link_libraries(VisibleHumanPasteWrite ${ITK_LIBRARIES}) -add_executable(CovariantVectorImageWrite CovariantVectorImageWrite.cxx ) +add_executable(CovariantVectorImageWrite CovariantVectorImageWrite.cxx) target_link_libraries(CovariantVectorImageWrite ${ITK_LIBRARIES}) -add_executable(ImageReadExtractWrite ImageReadExtractWrite.cxx ) +add_executable(ImageReadExtractWrite ImageReadExtractWrite.cxx) target_link_libraries(ImageReadExtractWrite ${ITK_LIBRARIES}) add_executable(IOPlugin IOPlugin.cxx) diff --git a/Examples/IO/test/CMakeLists.txt b/Examples/IO/test/CMakeLists.txt index 2836240e389..e423f398a6b 100644 --- a/Examples/IO/test/CMakeLists.txt +++ b/Examples/IO/test/CMakeLists.txt @@ -16,13 +16,13 @@ if(ITK_WRAP_PYTHON) endif() if(ITK_BUILD_SHARED_LIBS) - itk_add_test( NAME ExampleIOPluginTest + itk_add_test(NAME ExampleIOPluginTest COMMAND itkTestDriver --add-before-env ITK_AUTOLOAD_PATH "$" "$" "FileFreeIO::Size=128,256:Spacing=.5,.8:Origin=5,6:Direction=-1,0,0,-1" "${ITK_TEST_OUTPUT_DIR}ExampleIOPluginTest.png" ) - itk_add_test( NAME ExampleIOPluginTest2 + itk_add_test(NAME ExampleIOPluginTest2 COMMAND itkTestDriver "$" "FileFreeIO::Size=128,256:Spacing=.5,.8:Origin=5,6:Direction=-1,0,0,-1" @@ -47,7 +47,7 @@ foreach(ImageFormat ${LIST_OF_IMAGEIO_FORMATS}) endif() endforeach() -itk_add_test( NAME ImageIOFactoryRegisterTest +itk_add_test(NAME ImageIOFactoryRegisterTest COMMAND ${ITK_TEST_DRIVER} $ ) @@ -60,7 +60,7 @@ if(ITK_VISIBLEHUMAN_DATA_ROOT) COMMAND ${ITK_TEST_DRIVER} $ ${ITK_VISIBLEHUMAN_DATA_ROOT}/Male/Fullcolor/fullbody/ - ${TEMP}/VisibleHumanStreamReadWrite.mha ) + ${TEMP}/VisibleHumanStreamReadWrite.mha) itk_add_test(NAME VisibleHumanPasteWriteTest COMMAND ${ITK_TEST_DRIVER} $ @@ -80,4 +80,4 @@ if(ITK_VISIBLEHUMAN_DATA_ROOT) endif() itk_add_test(NAME TransformReadWriteTest - COMMAND TransformReadWrite ${TEMP}/TransformReadWrite.h5 ) + COMMAND TransformReadWrite ${TEMP}/TransformReadWrite.h5) diff --git a/Examples/Installation/CMakeLists.txt b/Examples/Installation/CMakeLists.txt index f9b7fac37d6..11b718824ab 100644 --- a/Examples/Installation/CMakeLists.txt +++ b/Examples/Installation/CMakeLists.txt @@ -19,6 +19,6 @@ project(HelloWorld) find_package(ITK REQUIRED) include(${ITK_USE_FILE}) -add_executable(HelloWorld HelloWorld.cxx ) +add_executable(HelloWorld HelloWorld.cxx) target_link_libraries(HelloWorld ${ITK_LIBRARIES}) diff --git a/Examples/Numerics/CMakeLists.txt b/Examples/Numerics/CMakeLists.txt index 64f15159e44..abc0ee787ad 100644 --- a/Examples/Numerics/CMakeLists.txt +++ b/Examples/Numerics/CMakeLists.txt @@ -1,4 +1,4 @@ project(NumericsExamples) -add_executable(FourierDescriptors1 FourierDescriptors1.cxx ) +add_executable(FourierDescriptors1 FourierDescriptors1.cxx) target_link_libraries(FourierDescriptors1 ${ITK_LIBRARIES}) diff --git a/Examples/RegistrationITKv4/CMakeLists.txt b/Examples/RegistrationITKv4/CMakeLists.txt index ccfca069185..385329ef8d9 100644 --- a/Examples/RegistrationITKv4/CMakeLists.txt +++ b/Examples/RegistrationITKv4/CMakeLists.txt @@ -1,172 +1,172 @@ project(ITKv4ImageRegistration) -add_executable(ImageRegistration3 ImageRegistration3.cxx ) +add_executable(ImageRegistration3 ImageRegistration3.cxx) target_link_libraries(ImageRegistration3 ${ITK_LIBRARIES}) -add_executable(ImageRegistration5 ImageRegistration5.cxx ) +add_executable(ImageRegistration5 ImageRegistration5.cxx) target_link_libraries(ImageRegistration5 ${ITK_LIBRARIES}) -add_executable(ImageRegistration6 ImageRegistration6.cxx ) +add_executable(ImageRegistration6 ImageRegistration6.cxx) target_link_libraries(ImageRegistration6 ${ITK_LIBRARIES}) -add_executable(ImageRegistration8 ImageRegistration8.cxx ) +add_executable(ImageRegistration8 ImageRegistration8.cxx) target_link_libraries(ImageRegistration8 ${ITK_LIBRARIES}) -add_executable(ImageRegistration9 ImageRegistration9.cxx ) +add_executable(ImageRegistration9 ImageRegistration9.cxx) target_link_libraries(ImageRegistration9 ${ITK_LIBRARIES}) -add_executable(ImageRegistration10 ImageRegistration10.cxx ) +add_executable(ImageRegistration10 ImageRegistration10.cxx) target_link_libraries(ImageRegistration10 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration4 DeformableRegistration4.cxx ) +add_executable(DeformableRegistration4 DeformableRegistration4.cxx) target_link_libraries(DeformableRegistration4 ${ITK_LIBRARIES}) -add_executable(ImageRegistration4 ImageRegistration4.cxx ) +add_executable(ImageRegistration4 ImageRegistration4.cxx) target_link_libraries(ImageRegistration4 ${ITK_LIBRARIES}) -add_executable(ImageRegistration7 ImageRegistration7.cxx ) +add_executable(ImageRegistration7 ImageRegistration7.cxx) target_link_libraries(ImageRegistration7 ${ITK_LIBRARIES}) -add_executable(ImageRegistration11 ImageRegistration11.cxx ) +add_executable(ImageRegistration11 ImageRegistration11.cxx) target_link_libraries(ImageRegistration11 ${ITK_LIBRARIES}) -add_executable(ImageRegistration12 ImageRegistration12.cxx ) +add_executable(ImageRegistration12 ImageRegistration12.cxx) target_link_libraries(ImageRegistration12 ${ITK_LIBRARIES}) -add_executable(ImageRegistration13 ImageRegistration13.cxx ) +add_executable(ImageRegistration13 ImageRegistration13.cxx) target_link_libraries(ImageRegistration13 ${ITK_LIBRARIES}) -add_executable(ImageRegistration14 ImageRegistration14.cxx ) +add_executable(ImageRegistration14 ImageRegistration14.cxx) target_link_libraries(ImageRegistration14 ${ITK_LIBRARIES}) -add_executable(ImageRegistration15 ImageRegistration15.cxx ) +add_executable(ImageRegistration15 ImageRegistration15.cxx) target_link_libraries(ImageRegistration15 ${ITK_LIBRARIES}) -add_executable(ImageRegistration16 ImageRegistration16.cxx ) +add_executable(ImageRegistration16 ImageRegistration16.cxx) target_link_libraries(ImageRegistration16 ${ITK_LIBRARIES}) -add_executable(ImageRegistration18 ImageRegistration18.cxx ) +add_executable(ImageRegistration18 ImageRegistration18.cxx) target_link_libraries(ImageRegistration18 ${ITK_LIBRARIES}) -add_executable(ImageRegistration19 ImageRegistration19.cxx ) +add_executable(ImageRegistration19 ImageRegistration19.cxx) target_link_libraries(ImageRegistration19 ${ITK_LIBRARIES}) -add_executable(ImageRegistration20 ImageRegistration20.cxx ) +add_executable(ImageRegistration20 ImageRegistration20.cxx) target_link_libraries(ImageRegistration20 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration6 DeformableRegistration6.cxx ) +add_executable(DeformableRegistration6 DeformableRegistration6.cxx) target_link_libraries(DeformableRegistration6 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration7 DeformableRegistration7.cxx ) +add_executable(DeformableRegistration7 DeformableRegistration7.cxx) target_link_libraries(DeformableRegistration7 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration8 DeformableRegistration8.cxx ) +add_executable(DeformableRegistration8 DeformableRegistration8.cxx) target_link_libraries(DeformableRegistration8 ${ITK_LIBRARIES}) -if( ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW ) - add_executable(DeformableRegistration9 DeformableRegistration9.cxx ) +if(ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) + add_executable(DeformableRegistration9 DeformableRegistration9.cxx) target_link_libraries(DeformableRegistration9 ${ITK_LIBRARIES}) - add_executable(DeformableRegistration10 DeformableRegistration10.cxx ) + add_executable(DeformableRegistration10 DeformableRegistration10.cxx) target_link_libraries(DeformableRegistration10 ${ITK_LIBRARIES}) endif() -add_executable(MultiResImageRegistration1 MultiResImageRegistration1.cxx ) +add_executable(MultiResImageRegistration1 MultiResImageRegistration1.cxx) target_link_libraries(MultiResImageRegistration1 ${ITK_LIBRARIES}) -add_executable(MultiResImageRegistration2 MultiResImageRegistration2.cxx ) +add_executable(MultiResImageRegistration2 MultiResImageRegistration2.cxx) target_link_libraries(MultiResImageRegistration2 ${ITK_LIBRARIES}) -add_executable(MultiResImageRegistration3 MultiResImageRegistration3.cxx ) +add_executable(MultiResImageRegistration3 MultiResImageRegistration3.cxx) target_link_libraries(MultiResImageRegistration3 ${ITK_LIBRARIES}) -add_executable(MultiStageImageRegistration1 MultiStageImageRegistration1.cxx ) +add_executable(MultiStageImageRegistration1 MultiStageImageRegistration1.cxx) target_link_libraries(MultiStageImageRegistration1 ${ITK_LIBRARIES}) -add_executable(MultiStageImageRegistration2 MultiStageImageRegistration2.cxx ) +add_executable(MultiStageImageRegistration2 MultiStageImageRegistration2.cxx) target_link_libraries(MultiStageImageRegistration2 ${ITK_LIBRARIES}) if (ITKFEMRegistration_ENABLED) - add_executable(DeformableRegistration1 DeformableRegistration1.cxx ) + add_executable(DeformableRegistration1 DeformableRegistration1.cxx) target_link_libraries(DeformableRegistration1 ${ITK_LIBRARIES}) - add_executable(DeformableRegistration11 DeformableRegistration11.cxx ) + add_executable(DeformableRegistration11 DeformableRegistration11.cxx) target_link_libraries(DeformableRegistration11 ${ITK_LIBRARIES}) endif() -add_executable(DeformableRegistration2 DeformableRegistration2.cxx ) +add_executable(DeformableRegistration2 DeformableRegistration2.cxx) target_link_libraries(DeformableRegistration2 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration3 DeformableRegistration3.cxx ) +add_executable(DeformableRegistration3 DeformableRegistration3.cxx) target_link_libraries(DeformableRegistration3 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration5 DeformableRegistration5.cxx ) +add_executable(DeformableRegistration5 DeformableRegistration5.cxx) target_link_libraries(DeformableRegistration5 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration12 DeformableRegistration12.cxx ) +add_executable(DeformableRegistration12 DeformableRegistration12.cxx) target_link_libraries(DeformableRegistration12 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration13 DeformableRegistration13.cxx ) +add_executable(DeformableRegistration13 DeformableRegistration13.cxx) target_link_libraries(DeformableRegistration13 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration14 DeformableRegistration14.cxx ) +add_executable(DeformableRegistration14 DeformableRegistration14.cxx) target_link_libraries(DeformableRegistration14 ${ITK_LIBRARIES}) -add_executable(ChangeInformationImageFilter ChangeInformationImageFilter.cxx ) +add_executable(ChangeInformationImageFilter ChangeInformationImageFilter.cxx) target_link_libraries(ChangeInformationImageFilter ${ITK_LIBRARIES}) -add_executable(DeformableRegistration15 DeformableRegistration15.cxx ) +add_executable(DeformableRegistration15 DeformableRegistration15.cxx) target_link_libraries(DeformableRegistration15 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration16 DeformableRegistration16.cxx ) +add_executable(DeformableRegistration16 DeformableRegistration16.cxx) target_link_libraries(DeformableRegistration16 ${ITK_LIBRARIES}) -add_executable(DeformableRegistration17 DeformableRegistration17.cxx ) +add_executable(DeformableRegistration17 DeformableRegistration17.cxx) target_link_libraries(DeformableRegistration17 ${ITK_LIBRARIES}) -add_executable(DisplacementFieldInitialization DisplacementFieldInitialization.cxx ) +add_executable(DisplacementFieldInitialization DisplacementFieldInitialization.cxx) target_link_libraries(DisplacementFieldInitialization ${ITK_LIBRARIES}) -add_executable(LandmarkWarping2 LandmarkWarping2.cxx ) +add_executable(LandmarkWarping2 LandmarkWarping2.cxx) target_link_libraries(LandmarkWarping2 ${ITK_LIBRARIES}) -add_executable(BSplineWarping1 BSplineWarping1.cxx ) +add_executable(BSplineWarping1 BSplineWarping1.cxx) target_link_libraries(BSplineWarping1 ${ITK_LIBRARIES}) -add_executable(BSplineWarping2 BSplineWarping2.cxx ) +add_executable(BSplineWarping2 BSplineWarping2.cxx) target_link_libraries(BSplineWarping2 ${ITK_LIBRARIES}) -add_executable(ThinPlateSplineWarp ThinPlateSplineWarp.cxx ) +add_executable(ThinPlateSplineWarp ThinPlateSplineWarp.cxx) target_link_libraries(ThinPlateSplineWarp ${ITK_LIBRARIES}) -add_executable(ModelToImageRegistration1 ModelToImageRegistration1.cxx ) +add_executable(ModelToImageRegistration1 ModelToImageRegistration1.cxx) target_link_libraries(ModelToImageRegistration1 ${ITK_LIBRARIES}) -add_executable(ModelToImageRegistration2 ModelToImageRegistration2.cxx ) +add_executable(ModelToImageRegistration2 ModelToImageRegistration2.cxx) target_link_libraries(ModelToImageRegistration2 ${ITK_LIBRARIES}) -add_executable(ImageRegistration1 ImageRegistration1.cxx ) +add_executable(ImageRegistration1 ImageRegistration1.cxx) target_link_libraries(ImageRegistration1 ${ITK_LIBRARIES}) -add_executable(ImageRegistration2 ImageRegistration2.cxx ) +add_executable(ImageRegistration2 ImageRegistration2.cxx) target_link_libraries(ImageRegistration2 ${ITK_LIBRARIES}) -add_executable(ImageRegistration17 ImageRegistration17.cxx ) +add_executable(ImageRegistration17 ImageRegistration17.cxx) target_link_libraries(ImageRegistration17 ${ITK_LIBRARIES}) -add_executable(ImageRegistrationHistogramPlotter ImageRegistrationHistogramPlotter.cxx ) +add_executable(ImageRegistrationHistogramPlotter ImageRegistrationHistogramPlotter.cxx) target_link_libraries(ImageRegistrationHistogramPlotter ${ITK_LIBRARIES}) -add_executable(MeanSquaresImageMetric1 MeanSquaresImageMetric1.cxx ) +add_executable(MeanSquaresImageMetric1 MeanSquaresImageMetric1.cxx) target_link_libraries(MeanSquaresImageMetric1 ${ITK_LIBRARIES}) -add_executable(IterativeClosestPoint1 IterativeClosestPoint1.cxx ) +add_executable(IterativeClosestPoint1 IterativeClosestPoint1.cxx) target_link_libraries(IterativeClosestPoint1 ${ITK_LIBRARIES}) -add_executable(IterativeClosestPoint2 IterativeClosestPoint2.cxx ) +add_executable(IterativeClosestPoint2 IterativeClosestPoint2.cxx) target_link_libraries(IterativeClosestPoint2 ${ITK_LIBRARIES}) -add_executable(IterativeClosestPoint3 IterativeClosestPoint3.cxx ) +add_executable(IterativeClosestPoint3 IterativeClosestPoint3.cxx) target_link_libraries(IterativeClosestPoint3 ${ITK_LIBRARIES}) if(BUILD_TESTING) diff --git a/Examples/RegistrationITKv4/test/CMakeLists.txt b/Examples/RegistrationITKv4/test/CMakeLists.txt index 7c5bd38a455..8665477ff93 100644 --- a/Examples/RegistrationITKv4/test/CMakeLists.txt +++ b/Examples/RegistrationITKv4/test/CMakeLists.txt @@ -154,7 +154,7 @@ itk_add_test(NAME ImageRegistration8Test COMMAND ${ITK_TEST_DRIVER} ) set_property(TEST ImageRegistration8Test APPEND PROPERTY LABELS RUNS_LONG) -if( ${CMAKE_BUILD_TYPE} MATCHES "Release") +if(${CMAKE_BUILD_TYPE} MATCHES "Release") # This test is computationally demanding. # Therefore we only run it in a Release build itk_add_test(NAME ImageRegistration20Test COMMAND ${ITK_TEST_DRIVER} @@ -496,7 +496,7 @@ itk_add_test(NAME DeformableRegistration13Test4 COMMAND ${ITK_TEST_DRIVER} ${TEMP}/DeformableRegistration13Test4FinalTransformParameters.txt ) -if( ITK_USE_BRAINWEB_DATA ) +if(ITK_USE_BRAINWEB_DATA) itk_add_test(NAME BSplineWarping2Test COMMAND ${ITK_TEST_DRIVER} $ @@ -510,9 +510,9 @@ if( ITK_USE_BRAINWEB_DATA ) set_property(TEST BSplineWarping2Test APPEND PROPERTY LABELS RUNS_LONG) set_property(TEST BSplineWarping2Test APPEND PROPERTY RUN_SERIAL True) - set( NUMBER_OF_BSPLINE_GRID_NODES 5 ) + set(NUMBER_OF_BSPLINE_GRID_NODES 5) - if( CTEST_TEST_TIMEOUT GREATER 3000 ) + if(CTEST_TEST_TIMEOUT GREATER 3000) itk_add_test(NAME DeformableRegistration8Test1 COMMAND ${ITK_TEST_DRIVER} --compare DATA{../../Data/BrainWeb/brainweb1e1a10f20.mha} @@ -628,7 +628,7 @@ if( ITK_USE_BRAINWEB_DATA ) 10.0 ) - if( CTEST_TEST_TIMEOUT GREATER 10000 ) + if(CTEST_TEST_TIMEOUT GREATER 10000) itk_add_test(NAME DeformableRegistration15Test1 COMMAND ${ITK_TEST_DRIVER} --compare DATA{../../Data/BrainWeb/brainweb1e1a10f20.mha} ${TEMP}/DeformableRegistration15Test1.mhd @@ -650,7 +650,7 @@ if( ITK_USE_BRAINWEB_DATA ) set_property(TEST DeformableRegistration15Test1 APPEND PROPERTY LABELS RUNS_LONG) endif() - if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 6 ) + if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 6) set(NUMBER_OF_BSPLINE_GRID_NODES 32) itk_add_test(NAME DeformableRegistration8Test2 COMMAND ${ITK_TEST_DRIVER} @@ -697,7 +697,7 @@ endif() # ITK_USE_BRAINWEB_DATA if(ITK_MRI_UNC_DATABASE_DATA_ROOT) -if( CTEST_TEST_TIMEOUT GREATER 10000 ) +if(CTEST_TEST_TIMEOUT GREATER 10000) itk_add_test(NAME DeformableRegistration15Test2 COMMAND ${ITK_TEST_DRIVER} $ ${ITK_MRI_UNC_DATABASE_DATA_ROOT}/b/I.hdr diff --git a/Examples/Segmentation/CMakeLists.txt b/Examples/Segmentation/CMakeLists.txt index ac5efe159c5..b064c950c73 100644 --- a/Examples/Segmentation/CMakeLists.txt +++ b/Examples/Segmentation/CMakeLists.txt @@ -1,64 +1,64 @@ project(ImageSegmentation) -add_executable(ConfidenceConnected ConfidenceConnected.cxx ) +add_executable(ConfidenceConnected ConfidenceConnected.cxx) target_link_libraries(ConfidenceConnected ${ITK_LIBRARIES}) -add_executable(ConfidenceConnected3D ConfidenceConnected3D.cxx ) +add_executable(ConfidenceConnected3D ConfidenceConnected3D.cxx) target_link_libraries(ConfidenceConnected3D ${ITK_LIBRARIES}) -add_executable(NeighborhoodConnectedImageFilter NeighborhoodConnectedImageFilter.cxx ) +add_executable(NeighborhoodConnectedImageFilter NeighborhoodConnectedImageFilter.cxx) target_link_libraries(NeighborhoodConnectedImageFilter ${ITK_LIBRARIES}) -add_executable(IsolatedConnectedImageFilter IsolatedConnectedImageFilter.cxx ) +add_executable(IsolatedConnectedImageFilter IsolatedConnectedImageFilter.cxx) target_link_libraries(IsolatedConnectedImageFilter ${ITK_LIBRARIES}) -add_executable(ConnectedThresholdImageFilter ConnectedThresholdImageFilter.cxx ) +add_executable(ConnectedThresholdImageFilter ConnectedThresholdImageFilter.cxx) target_link_libraries(ConnectedThresholdImageFilter ${ITK_LIBRARIES}) -add_executable(FastMarchingImageFilter FastMarchingImageFilter.cxx ) +add_executable(FastMarchingImageFilter FastMarchingImageFilter.cxx) target_link_libraries(FastMarchingImageFilter ${ITK_LIBRARIES}) add_executable(GeodesicActiveContourShapePriorLevelSetImageFilter -GeodesicActiveContourShapePriorLevelSetImageFilter.cxx ) +GeodesicActiveContourShapePriorLevelSetImageFilter.cxx) target_link_libraries(GeodesicActiveContourShapePriorLevelSetImageFilter ${ITK_LIBRARIES}) -add_executable(GibbsPriorImageFilter1 GibbsPriorImageFilter1.cxx ) +add_executable(GibbsPriorImageFilter1 GibbsPriorImageFilter1.cxx) target_link_libraries(GibbsPriorImageFilter1 ${ITK_LIBRARIES}) -add_executable(HoughTransform2DCirclesImageFilter HoughTransform2DCirclesImageFilter.cxx ) +add_executable(HoughTransform2DCirclesImageFilter HoughTransform2DCirclesImageFilter.cxx) target_link_libraries(HoughTransform2DCirclesImageFilter ${ITK_LIBRARIES}) -add_executable(HoughTransform2DLinesImageFilter HoughTransform2DLinesImageFilter.cxx ) +add_executable(HoughTransform2DLinesImageFilter HoughTransform2DLinesImageFilter.cxx) target_link_libraries(HoughTransform2DLinesImageFilter ${ITK_LIBRARIES}) -add_executable(VectorConfidenceConnected VectorConfidenceConnected.cxx ) +add_executable(VectorConfidenceConnected VectorConfidenceConnected.cxx) target_link_libraries(VectorConfidenceConnected ${ITK_LIBRARIES}) -add_executable(RelabelComponentImageFilter RelabelComponentImageFilter.cxx ) +add_executable(RelabelComponentImageFilter RelabelComponentImageFilter.cxx) target_link_libraries(RelabelComponentImageFilter ${ITK_LIBRARIES}) -add_executable(CannySegmentationLevelSetImageFilter CannySegmentationLevelSetImageFilter.cxx ) +add_executable(CannySegmentationLevelSetImageFilter CannySegmentationLevelSetImageFilter.cxx) target_link_libraries(CannySegmentationLevelSetImageFilter ${ITK_LIBRARIES}) -add_executable(GeodesicActiveContourImageFilter GeodesicActiveContourImageFilter.cxx ) +add_executable(GeodesicActiveContourImageFilter GeodesicActiveContourImageFilter.cxx) target_link_libraries(GeodesicActiveContourImageFilter ${ITK_LIBRARIES}) -add_executable(ShapeDetectionLevelSetFilter ShapeDetectionLevelSetFilter.cxx ) +add_executable(ShapeDetectionLevelSetFilter ShapeDetectionLevelSetFilter.cxx) target_link_libraries(ShapeDetectionLevelSetFilter ${ITK_LIBRARIES}) -add_executable(CurvesLevelSetImageFilter CurvesLevelSetImageFilter.cxx ) +add_executable(CurvesLevelSetImageFilter CurvesLevelSetImageFilter.cxx) target_link_libraries(CurvesLevelSetImageFilter ${ITK_LIBRARIES}) -add_executable(WatershedSegmentation1 WatershedSegmentation1.cxx ) +add_executable(WatershedSegmentation1 WatershedSegmentation1.cxx) target_link_libraries(WatershedSegmentation1 ${ITK_LIBRARIES}) -add_executable(WatershedSegmentation2 WatershedSegmentation2.cxx ) +add_executable(WatershedSegmentation2 WatershedSegmentation2.cxx) target_link_libraries(WatershedSegmentation2 ${ITK_LIBRARIES}) -add_executable(LaplacianSegmentationLevelSetImageFilter LaplacianSegmentationLevelSetImageFilter.cxx ) +add_executable(LaplacianSegmentationLevelSetImageFilter LaplacianSegmentationLevelSetImageFilter.cxx) target_link_libraries(LaplacianSegmentationLevelSetImageFilter ${ITK_LIBRARIES}) -add_executable(ThresholdSegmentationLevelSetImageFilter ThresholdSegmentationLevelSetImageFilter.cxx ) +add_executable(ThresholdSegmentationLevelSetImageFilter ThresholdSegmentationLevelSetImageFilter.cxx) target_link_libraries(ThresholdSegmentationLevelSetImageFilter ${ITK_LIBRARIES}) if(BUILD_TESTING) diff --git a/Examples/Statistics/CMakeLists.txt b/Examples/Statistics/CMakeLists.txt index e59051fa0cd..d71334682f7 100644 --- a/Examples/Statistics/CMakeLists.txt +++ b/Examples/Statistics/CMakeLists.txt @@ -1,99 +1,99 @@ project(StatisticsExamples) -add_executable(BayesianPluginClassifier BayesianPluginClassifier.cxx ) +add_executable(BayesianPluginClassifier BayesianPluginClassifier.cxx) target_link_libraries(BayesianPluginClassifier ${ITK_LIBRARIES}) -add_executable( BayesianClassifierInitializer BayesianClassifierInitializer.cxx ) +add_executable(BayesianClassifierInitializer BayesianClassifierInitializer.cxx) target_link_libraries(BayesianClassifierInitializer ${ITK_LIBRARIES}) -add_executable( BayesianClassifier BayesianClassifier.cxx ) +add_executable(BayesianClassifier BayesianClassifier.cxx) target_link_libraries(BayesianClassifier ${ITK_LIBRARIES}) -add_executable(EuclideanDistanceMetric EuclideanDistanceMetric.cxx ) +add_executable(EuclideanDistanceMetric EuclideanDistanceMetric.cxx) target_link_libraries(EuclideanDistanceMetric ${ITK_LIBRARIES}) -add_executable(ExpectationMaximizationMixtureModelEstimator ExpectationMaximizationMixtureModelEstimator.cxx ) +add_executable(ExpectationMaximizationMixtureModelEstimator ExpectationMaximizationMixtureModelEstimator.cxx) target_link_libraries(ExpectationMaximizationMixtureModelEstimator ${ITK_LIBRARIES}) -add_executable(GaussianMembershipFunction GaussianMembershipFunction.cxx ) +add_executable(GaussianMembershipFunction GaussianMembershipFunction.cxx) target_link_libraries(GaussianMembershipFunction ${ITK_LIBRARIES}) -add_executable(Histogram Histogram.cxx ) +add_executable(Histogram Histogram.cxx) target_link_libraries(Histogram ${ITK_LIBRARIES}) -add_executable(KdTree KdTree.cxx ) +add_executable(KdTree KdTree.cxx) target_link_libraries(KdTree ${ITK_LIBRARIES}) -add_executable(KdTreeBasedKMeansClustering KdTreeBasedKMeansClustering.cxx ) +add_executable(KdTreeBasedKMeansClustering KdTreeBasedKMeansClustering.cxx) target_link_libraries(KdTreeBasedKMeansClustering ${ITK_LIBRARIES}) -add_executable(ListSample ListSample.cxx ) +add_executable(ListSample ListSample.cxx) target_link_libraries(ListSample ${ITK_LIBRARIES}) -add_executable(SampleToHistogramFilter SampleToHistogramFilter.cxx ) +add_executable(SampleToHistogramFilter SampleToHistogramFilter.cxx) target_link_libraries(SampleToHistogramFilter ${ITK_LIBRARIES}) -add_executable(MaximumDecisionRule MaximumDecisionRule.cxx ) +add_executable(MaximumDecisionRule MaximumDecisionRule.cxx) target_link_libraries(MaximumDecisionRule ${ITK_LIBRARIES}) -add_executable(MaximumRatioDecisionRule MaximumRatioDecisionRule.cxx ) +add_executable(MaximumRatioDecisionRule MaximumRatioDecisionRule.cxx) target_link_libraries(MaximumRatioDecisionRule ${ITK_LIBRARIES}) -add_executable(MembershipSample MembershipSample.cxx ) +add_executable(MembershipSample MembershipSample.cxx) target_link_libraries(MembershipSample ${ITK_LIBRARIES}) -add_executable(MinimumDecisionRule MinimumDecisionRule.cxx ) +add_executable(MinimumDecisionRule MinimumDecisionRule.cxx) target_link_libraries(MinimumDecisionRule ${ITK_LIBRARIES}) # # At the moment, itkNeighborhoodSampler is incomplete, so this example # can't be updated # -#add_executable(NeighborhoodSampler NeighborhoodSampler.cxx ) +#add_executable(NeighborhoodSampler NeighborhoodSampler.cxx) #target_link_libraries(NeighborhoodSampler ${ITK_LIBRARIES}) -add_executable(NormalVariateGenerator NormalVariateGenerator.cxx ) +add_executable(NormalVariateGenerator NormalVariateGenerator.cxx) target_link_libraries(NormalVariateGenerator ${ITK_LIBRARIES}) -add_executable(PointSetToListSampleAdaptor PointSetToListSampleAdaptor.cxx ) +add_executable(PointSetToListSampleAdaptor PointSetToListSampleAdaptor.cxx) target_link_libraries(PointSetToListSampleAdaptor ${ITK_LIBRARIES}) -add_executable(SampleStatistics SampleStatistics.cxx ) +add_executable(SampleStatistics SampleStatistics.cxx) target_link_libraries(SampleStatistics ${ITK_LIBRARIES}) -add_executable(SampleSorting SampleSorting.cxx ) +add_executable(SampleSorting SampleSorting.cxx) target_link_libraries(SampleSorting ${ITK_LIBRARIES}) -add_executable(WeightedSampleStatistics WeightedSampleStatistics.cxx ) +add_executable(WeightedSampleStatistics WeightedSampleStatistics.cxx) target_link_libraries(WeightedSampleStatistics ${ITK_LIBRARIES}) -add_executable(ImageHistogram3 ImageHistogram3.cxx ) +add_executable(ImageHistogram3 ImageHistogram3.cxx) target_link_libraries(ImageHistogram3 ${ITK_LIBRARIES}) -add_executable(ScalarImageMarkovRandomField1 ScalarImageMarkovRandomField1.cxx ) +add_executable(ScalarImageMarkovRandomField1 ScalarImageMarkovRandomField1.cxx) target_link_libraries(ScalarImageMarkovRandomField1 ${ITK_LIBRARIES}) -add_executable(ScalarImageKmeansClassifier ScalarImageKmeansClassifier.cxx ) +add_executable(ScalarImageKmeansClassifier ScalarImageKmeansClassifier.cxx) target_link_libraries(ScalarImageKmeansClassifier ${ITK_LIBRARIES}) -add_executable(ImageToListSampleAdaptor ImageToListSampleAdaptor.cxx ) +add_executable(ImageToListSampleAdaptor ImageToListSampleAdaptor.cxx) target_link_libraries(ImageToListSampleAdaptor ${ITK_LIBRARIES}) -add_executable(ImageHistogram1 ImageHistogram1.cxx ) +add_executable(ImageHistogram1 ImageHistogram1.cxx) target_link_libraries(ImageHistogram1 ${ITK_LIBRARIES}) -add_executable(ImageHistogram2 ImageHistogram2.cxx ) +add_executable(ImageHistogram2 ImageHistogram2.cxx) target_link_libraries(ImageHistogram2 ${ITK_LIBRARIES}) -add_executable(ImageHistogram4 ImageHistogram4.cxx ) +add_executable(ImageHistogram4 ImageHistogram4.cxx) target_link_libraries(ImageHistogram4 ${ITK_LIBRARIES}) -add_executable(ImageEntropy1 ImageEntropy1.cxx ) +add_executable(ImageEntropy1 ImageEntropy1.cxx) target_link_libraries(ImageEntropy1 ${ITK_LIBRARIES}) -add_executable(ImageMutualInformation1 ImageMutualInformation1.cxx ) +add_executable(ImageMutualInformation1 ImageMutualInformation1.cxx) target_link_libraries(ImageMutualInformation1 ${ITK_LIBRARIES}) -add_executable(ScalarImageKmeansModelEstimator ScalarImageKmeansModelEstimator.cxx ) +add_executable(ScalarImageKmeansModelEstimator ScalarImageKmeansModelEstimator.cxx) target_link_libraries(ScalarImageKmeansModelEstimator ${ITK_LIBRARIES}) if(BUILD_TESTING) diff --git a/Modules/Bridge/NumPy/itk-module.cmake b/Modules/Bridge/NumPy/itk-module.cmake index 3997bc31f40..73561eca9e6 100644 --- a/Modules/Bridge/NumPy/itk-module.cmake +++ b/Modules/Bridge/NumPy/itk-module.cmake @@ -2,7 +2,7 @@ set(DOCUMENTATION "This modules provides methods to convert wrapped itk::Image's to NumPy arrays and vice versa.") if(ITK_WRAP_PYTHON) - set(_exclude_from_default ) + set(_exclude_from_default) else() set(_exclude_from_default EXCLUDE_FROM_DEFAULT) endif() diff --git a/Modules/Core/Common/CMakeLists.txt b/Modules/Core/Common/CMakeLists.txt index 4dd1fde2406..06ef4d1583f 100644 --- a/Modules/Core/Common/CMakeLists.txt +++ b/Modules/Core/Common/CMakeLists.txt @@ -60,10 +60,10 @@ foreach(CXX_TEST_VERSION 201103L 201402L 201703L) endif() endforeach() -try_compile( ITK_HAS_GNU_ATTRIBUTE_ALIGNED +try_compile(ITK_HAS_GNU_ATTRIBUTE_ALIGNED ${ITK_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/CMake/itkCheckHasGNUAttributeAligned.cxx - CMAKE_FLAGS "-DCMAKE_BUILD_TYPE:STRING=Debug" ) + CMAKE_FLAGS "-DCMAKE_BUILD_TYPE:STRING=Debug") set(ITK_WINDOWS_EXPORT_ALL_SYMBOLS ${CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS}) diff --git a/Modules/Core/Common/itk-module.cmake b/Modules/Core/Common/itk-module.cmake index d2b38ec2fa0..d24758419db 100644 --- a/Modules/Core/Common/itk-module.cmake +++ b/Modules/Core/Common/itk-module.cmake @@ -6,7 +6,7 @@ for multi-threading, and a collection of classes that isolate ITK from platform specific features. It is anticipated that most other ITK modules will depend on this one.") -if( Module_ITKTBB ) +if(Module_ITKTBB) set(ITKCOMMON_TBB_DEPENDS ITKTBB) endif() diff --git a/Modules/Core/Common/src/CMakeLists.txt b/Modules/Core/Common/src/CMakeLists.txt index 5afb46b1ed5..5b90ee9a4de 100644 --- a/Modules/Core/Common/src/CMakeLists.txt +++ b/Modules/Core/Common/src/CMakeLists.txt @@ -4,8 +4,8 @@ get_git_head_revision(GIT_CONFIG_REFSPEC GIT_CONFIG_SHA1) git_describe(GIT_VERSION_DESC) git_head_date(GIT_CONFIG_DATE) git_head_localmods(GIT_LOCAL_MODIFICATIONS) -if( GIT_LOCAL_MODIFICATIONS MATCHES ".*files changed.*") - set(GIT_LOCAL_MODIFICATIONS " (with uncommitted code modifications ${GIT_LOCAL_MODIFICATIONS} )") +if(GIT_LOCAL_MODIFICATIONS MATCHES ".*files changed.*") + set(GIT_LOCAL_MODIFICATIONS " (with uncommitted code modifications ${GIT_LOCAL_MODIFICATIONS})") endif() string(TIMESTAMP CONFIGURE_DATE "%Y-%m-%d %H:%M" UTC) @@ -20,12 +20,12 @@ set(MAPPING_VALUES " MAKE_MAP_ENTRY( \"CONFIGURE_DATE\", \"${CONFIGURE_DATE}\", \"The date of configuration.\" ); MAKE_MAP_ENTRY( \"GIT_CONFIG_SHA1\", \"${GIT_CONFIG_SHA1}${GIT_LOCAL_MODIFICATIONS}\", - \"The git HEAD SHA1 has at configuration.\" ); + \"The git HEAD SHA1 has at configuration.\"); MAKE_MAP_ENTRY( \"GIT_CONFIG_REFSPEC\", \"${GIT_CONFIG_REFSPEC}\", \"The git HEAD ref spec.\" ); MAKE_MAP_ENTRY( \"GIT_CONFIG_DATE\", \"${GIT_CONFIG_DATE}\", \"The git HEAD date\" ); MAKE_MAP_ENTRY( \"GIT_VERSION_DESC\", \"${GIT_VERSION_DESC}\", \"The git HEAD version tag-commits-hash\" ); - MAKE_MAP_ENTRY( \"CMAKE_VERSION\", \"${CMAKE_VERSION}\", \"The version of cmake used to configure.\" ); + MAKE_MAP_ENTRY( \"CMAKE_VERSION\", \"${CMAKE_VERSION}\", \"The version of cmake used to configure.\"); MAKE_MAP_ENTRY( \"CMAKE_GENERATOR\", \"${CMAKE_GENERATOR}\", \"The generator used for building.\" ); MAKE_MAP_ENTRY( \"CMAKE_BUILD_TYPE\", \"${CMAKE_BUILD_TYPE}\", \"The build type requested.\" ); @@ -164,28 +164,28 @@ if(ITK_USE_TBB) endif() # Prevent optimization from affecting the floating point calculation. -if( CMAKE_CXX_COMPILER MATCHES "^icc" ) - if( WIN32 ) - set_source_files_properties( itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS /fp precise ) +if(CMAKE_CXX_COMPILER MATCHES "^icc") + if(WIN32) + set_source_files_properties(itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS /fp precise) else() - set_source_files_properties( itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fp-model precise ) + set_source_files_properties(itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fp-model precise) endif() -elseif( CMAKE_COMPILER_IS_GNUCXX ) +elseif(CMAKE_COMPILER_IS_GNUCXX) # -fno-associative-math appears to only be present in GCC 4.3 onwards. - include( CheckCXXCompilerFlag ) - CHECK_CXX_COMPILER_FLAG( -fno-associative-math gcc_has_no_associative_math ) - if( gcc_has_no_associative_math ) - set_source_files_properties( itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fno-associative-math ) + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG( -fno-associative-math gcc_has_no_associative_math) + if(gcc_has_no_associative_math) + set_source_files_properties(itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fno-associative-math) else() - set_source_files_properties( itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fno-unsafe-math-optimizations ) + set_source_files_properties(itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fno-unsafe-math-optimizations) endif() -elseif( MSVC ) - set_source_files_properties( itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fp:precise ) +elseif(MSVC) + set_source_files_properties(itkCompensatedSummation.cxx PROPERTIES COMPILE_FLAGS -fp:precise) endif() ### generating libraries -itk_module_add_library( ITKCommon ${ITKCommon_SRCS}) +itk_module_add_library(ITKCommon ${ITKCommon_SRCS}) target_link_libraries(ITKCommon LINK_PUBLIC itksys ITKVNLInstantiation) @@ -200,8 +200,8 @@ if(ITK_USE_TBB) # https://software.intel.com/en-us/node/506139 # The macro TBB_DEPRECATED controls deprecated features. # Define it to 0 to remove deprecated Intel® Threading Building Blocks (Intel® TBB) 2.1 interfaces. - target_compile_definitions( ITKCommon PUBLIC TBB_DEPRECATED=0) + target_compile_definitions(ITKCommon PUBLIC TBB_DEPRECATED=0) # The macro TBB_USE_CAPTURED_EXCEPTION controls rethrow of exceptions within the library. # Define TBB_USE_CAPTURED_EXCEPTION=0 to request rethrow of the exact exception. - target_compile_definitions( ITKCommon PUBLIC TBB_USE_CAPTURED_EXCEPTION=0) + target_compile_definitions(ITKCommon PUBLIC TBB_USE_CAPTURED_EXCEPTION=0) endif() diff --git a/Modules/Core/Common/test/CMakeLists.txt b/Modules/Core/Common/test/CMakeLists.txt index 2e20950e7f7..cfd0d69f1bd 100644 --- a/Modules/Core/Common/test/CMakeLists.txt +++ b/Modules/Core/Common/test/CMakeLists.txt @@ -199,7 +199,7 @@ set(BASELINE "${ITK_DATA_ROOT}/Baseline/Common") set(TEMP ${ITK_TEST_OUTPUT_DIR}) -add_executable(itkMathTest itkMathTest.cxx ) +add_executable(itkMathTest itkMathTest.cxx) itk_module_target_label(itkMathTest) target_link_libraries(itkMathTest LINK_PUBLIC ${ITKCommon_LIBRARIES}) itk_add_test(NAME itkMathTest COMMAND itkMathTest) @@ -336,7 +336,7 @@ itk_add_test(NAME itkImageSliceIteratorTest COMMAND ITKCommon1TestDriver itkImageSliceIteratorTest) itk_add_test(NAME itkImageTest COMMAND ITKCommon1TestDriver itkImageTest) itk_add_test(NAME itkLightObjectTest COMMAND ITKCommon1TestDriver itkLightObjectTest) -itk_add_test(NAME itkLineIteratorTest COMMAND ITKCommon1TestDriver itkLineIteratorTest DATA{${BASELINE}/itkLineIteratorTest.txt} ) +itk_add_test(NAME itkLineIteratorTest COMMAND ITKCommon1TestDriver itkLineIteratorTest DATA{${BASELINE}/itkLineIteratorTest.txt}) itk_add_test(NAME itkLoggerTest COMMAND ITKCommon1TestDriver itkLoggerTest ${TEMP}/test_logger.txt) itk_add_test(NAME itkLoggerOutputTest COMMAND ITKCommon2TestDriver itkLoggerOutputTest ${TEMP}/test_loggerOutput.txt) itk_add_test(NAME itkLoggerManagerTest COMMAND ITKCommon2TestDriver itkLoggerManagerTest ${TEMP}/test_LoggerManager.txt) @@ -530,14 +530,14 @@ itk_add_test(NAME itkConstantBoundaryConditionTest COMMAND ITKCommon2TestDriver itk_add_test(NAME itkVNLRoundProfileTest1 COMMAND ITKCommon2TestDriver itkVNLRoundProfileTest1) itk_add_test(NAME itkMemoryProbesCollecterBaseTest COMMAND ITKCommon2TestDriver itkMemoryProbesCollecterBaseTest) -if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 4 ) +if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 4) itk_add_test(NAME itkImageFillBufferTest4.1 COMMAND ITKCommon2TestDriver itkImageFillBufferTest 4.1) set_property(TEST itkImageFillBufferTest4.1 APPEND PROPERTY LABELS RUNS_LONG) - set_tests_properties( itkImageFillBufferTest4.1 PROPERTIES RESOURCE_LOCK MEMORY_SIZE ) + set_tests_properties(itkImageFillBufferTest4.1 PROPERTIES RESOURCE_LOCK MEMORY_SIZE) endif() -itk_add_test(NAME itkImageAlgorithmCopyTest COMMAND ITKCommon2TestDriver itkImageAlgorithmCopyTest ) -itk_add_test(NAME itkImageAlgorithmCopyTest2 COMMAND ITKCommon2TestDriver itkImageAlgorithmCopyTest2 ) +itk_add_test(NAME itkImageAlgorithmCopyTest COMMAND ITKCommon2TestDriver itkImageAlgorithmCopyTest) +itk_add_test(NAME itkImageAlgorithmCopyTest2 COMMAND ITKCommon2TestDriver itkImageAlgorithmCopyTest2) itk_add_test(NAME itkOptimizerParametersTest COMMAND ITKCommon2TestDriver itkOptimizerParametersTest) itk_add_test(NAME itkImageVectorOptimizerParametersHelperTest COMMAND ITKCommon2TestDriver itkImageVectorOptimizerParametersHelperTest) itk_add_test(NAME itkCompensatedSummationTest COMMAND ITKCommon2TestDriver itkCompensatedSummationTest) @@ -674,7 +674,7 @@ if(NOT ITK_BUILD_SHARED_LIBS AND NOT CMAKE_EXE_LINKER_FLAGS MATCHES ".*-static.* # Linking static ITK libraries twice, into two different binaries for the same process, is not recommended or supported. BuildSharedTestLibrary(A SHARED) BuildSharedTestLibrary(B SHARED) - add_executable(itkObjectFactoryBasePrivateDestructor itkObjectFactoryBasePrivateDestructor.cxx ) + add_executable(itkObjectFactoryBasePrivateDestructor itkObjectFactoryBasePrivateDestructor.cxx) itk_module_target_label(itkObjectFactoryBasePrivateDestructor) target_link_libraries(itkObjectFactoryBasePrivateDestructor LINK_PUBLIC diff --git a/Modules/Core/Transform/test/CMakeLists.txt b/Modules/Core/Transform/test/CMakeLists.txt index 61515f43cdd..177d04594c1 100644 --- a/Modules/Core/Transform/test/CMakeLists.txt +++ b/Modules/Core/Transform/test/CMakeLists.txt @@ -162,7 +162,7 @@ itk_add_test(NAME itkBSplineTransformInitializerTest1 ${ITK_EXAMPLE_DATA_ROOT}/BSplineDisplacements1.txt ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBorder20.png ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBorder20.png ${ITK_TEST_OUTPUT_DIR}/itkBSplineTransformInitializerTest1.png ${ITK_TEST_OUTPUT_DIR}/itkBSplineTransformInitializerTest1DeformationField.mhd) itk_add_test(NAME itkBSplineTransformInitializerTest2 COMMAND ITKTransformTestDriver itkBSplineTransformInitializerTest2 - ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBorder20.png ) + ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBorder20.png) itk_add_test(NAME itkVersorRigid3DTransformTest COMMAND ITKTransformTestDriver itkVersorRigid3DTransformTest) itk_add_test(NAME itkVersorTransformTest @@ -178,7 +178,7 @@ itk_add_test(NAME itkMultiTransformTest itk_add_test(NAME itkTestTransformGetInverse COMMAND ITKTransformTestDriver itkTestTransformGetInverse) set_property(TEST itkTestTransformGetInverse APPEND PROPERTY LABELS RUNS_LONG) -set_tests_properties( itkTestTransformGetInverse PROPERTIES COST 50 ) +set_tests_properties(itkTestTransformGetInverse PROPERTIES COST 50) itk_add_test(NAME itkTransformGeometryImageFilterTest COMMAND ITKTransformTestDriver itkTransformGeometryImageFilterTest ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensity3Slices.mha diff --git a/Modules/Filtering/DisplacementField/test/CMakeLists.txt b/Modules/Filtering/DisplacementField/test/CMakeLists.txt index 03b76e6ccb3..74319ab88dd 100644 --- a/Modules/Filtering/DisplacementField/test/CMakeLists.txt +++ b/Modules/Filtering/DisplacementField/test/CMakeLists.txt @@ -24,7 +24,7 @@ itkExponentialDisplacementFieldImageFilterTest.cxx CreateTestDriver(ITKDisplacementField "${ITKDisplacementField-Test_LIBRARIES}" "${ITKDisplacementFieldTests}") itk_add_test(NAME itkComposeDisplacementFieldsImageFilterTest - COMMAND ITKDisplacementFieldTestDriver itkComposeDisplacementFieldsImageFilterTest ) + COMMAND ITKDisplacementFieldTestDriver itkComposeDisplacementFieldsImageFilterTest) itk_add_test(NAME itkDisplacementFieldJacobianDeterminantFilterTest COMMAND ITKDisplacementFieldTestDriver itkDisplacementFieldJacobianDeterminantFilterTest) itk_add_test(NAME itkIterativeInverseDisplacementFieldImageFilterTest @@ -51,15 +51,15 @@ itk_add_test(NAME itkBSplineExponentialDiffeomorphicTransformTest COMMAND ITKDisplacementFieldTestDriver itkBSplineExponentialDiffeomorphicTransformTest) itk_add_test(NAME itkTimeVaryingVelocityFieldTransformTest - COMMAND ITKDisplacementFieldTestDriver itkTimeVaryingVelocityFieldTransformTest ) + COMMAND ITKDisplacementFieldTestDriver itkTimeVaryingVelocityFieldTransformTest) itk_add_test(NAME itkTimeVaryingVelocityFieldIntegrationImageFilterTest COMMAND ITKDisplacementFieldTestDriver itkTimeVaryingVelocityFieldIntegrationImageFilterTest 0.3 0.75 100 0.2 0.8 50 1.0 0.0 100) itk_add_test(NAME itkTimeVaryingBSplineVelocityFieldTransformTest - COMMAND ITKDisplacementFieldTestDriver itkTimeVaryingBSplineVelocityFieldTransformTest ) + COMMAND ITKDisplacementFieldTestDriver itkTimeVaryingBSplineVelocityFieldTransformTest) itk_add_test(NAME itkInvertDisplacementFieldImageFilterTest COMMAND ITKDisplacementFieldTestDriver itkInvertDisplacementFieldImageFilterTest 50 0.1 0.001 0) itk_add_test(NAME itkDisplacementFieldToBSplineImageFilterTest - COMMAND ITKDisplacementFieldTestDriver itkDisplacementFieldToBSplineImageFilterTest ) + COMMAND ITKDisplacementFieldTestDriver itkDisplacementFieldToBSplineImageFilterTest) itk_add_test(NAME itkTransformToDisplacementFieldFilterTest01 COMMAND ITKDisplacementFieldTestDriver --compare ${ITK_TEST_OUTPUT_DIR}/itkTransformToDisplacementFieldFilterTestField01.mha @@ -74,7 +74,7 @@ itk_add_test(NAME itkTransformToDisplacementFieldFilterTest02 itkTransformToDisplacementFieldFilterTest BSpline ${ITK_TEST_OUTPUT_DIR}/itkTransformToDisplacementFieldFilterTestField02.mha - DATA{${ITK_DATA_ROOT}/Input/parametersBSpline.txt} ) + DATA{${ITK_DATA_ROOT}/Input/parametersBSpline.txt}) itk_add_test(NAME itkTransformToDisplacementFieldFilterTest03 COMMAND ITKDisplacementFieldTestDriver --compare ${ITK_TEST_OUTPUT_DIR}/transformedImage.nii diff --git a/Modules/Filtering/FFT/src/CMakeLists.txt b/Modules/Filtering/FFT/src/CMakeLists.txt index 24ff41641f0..bf88f29f7b6 100644 --- a/Modules/Filtering/FFT/src/CMakeLists.txt +++ b/Modules/Filtering/FFT/src/CMakeLists.txt @@ -2,15 +2,15 @@ set(ITKFFT_SRCS itkComplexToComplexFFTImageFilter.cxx itkVnlFFTImageFilterInitFactory.cxx) -if( ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) - list(APPEND ITKFFT_SRCS itkFFTWGlobalConfiguration.cxx ) - list(APPEND ITKFFT_SRCS itkFFTWFFTImageFilterInitFactory.cxx ) +if(ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) + list(APPEND ITKFFT_SRCS itkFFTWGlobalConfiguration.cxx) + list(APPEND ITKFFT_SRCS itkFFTWFFTImageFilterInitFactory.cxx) endif() itk_module_add_library(ITKFFT ${ITKFFT_SRCS}) # this library is only needed if FFTW is used -if( ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) +if(ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) if(ITK_USE_FFTWD) if(NOT ITK_USE_SYSTEM_FFTW) diff --git a/Modules/Filtering/FFT/test/CMakeLists.txt b/Modules/Filtering/FFT/test/CMakeLists.txt index d729394d576..75a84c465c9 100644 --- a/Modules/Filtering/FFT/test/CMakeLists.txt +++ b/Modules/Filtering/FFT/test/CMakeLists.txt @@ -16,7 +16,7 @@ itkVnlComplexToComplexFFTImageFilterTest.cxx ) if(ITK_USE_FFTWF) - list( APPEND ITKFFTTests + list(APPEND ITKFFTTests itkFFTWF_FFTTest.cxx itkFFTWF_RealFFTTest.cxx itkVnlFFTWF_FFTTest.cxx @@ -25,7 +25,7 @@ if(ITK_USE_FFTWF) endif() if(ITK_USE_FFTWD) - list( APPEND ITKFFTTests + list(APPEND ITKFFTTests itkFFTWD_FFTTest.cxx itkFFTWD_RealFFTTest.cxx itkVnlFFTWD_FFTTest.cxx @@ -34,7 +34,7 @@ if(ITK_USE_FFTWD) endif() if(ITK_USE_FFTWF OR ITK_USE_FFTWD) - list( APPEND ITKFFTTests + list(APPEND ITKFFTTests itkFFTWComplexToComplexFFTImageFilterTest.cxx ) endif() @@ -55,22 +55,22 @@ set_tests_properties(itkVnlRealFFTTest PROPERTIES ATTACHED_FILES_ON_FAIL ${TEMP} if(ITK_USE_FFTWF) itk_add_test(NAME itkFFTWF_FFTTest - COMMAND ITKFFTTestDriver itkFFTWF_FFTTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKFFTTestDriver itkFFTWF_FFTTest ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkFFTWF_RealFFTTest - COMMAND ITKFFTTestDriver itkFFTWF_RealFFTTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKFFTTestDriver itkFFTWF_RealFFTTest ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkVnlFFTWF_FFTTest - COMMAND ITKFFTTestDriver itkVnlFFTWF_FFTTest ) + COMMAND ITKFFTTestDriver itkVnlFFTWF_FFTTest) itk_add_test(NAME itkVnlFFTWF_RealFFTTest - COMMAND ITKFFTTestDriver itkVnlFFTWF_RealFFTTest ) + COMMAND ITKFFTTestDriver itkVnlFFTWF_RealFFTTest) set_tests_properties(itkVnlFFTWF_FFTTest itkVnlFFTWF_RealFFTTest PROPERTIES ENVIRONMENT "ITK_FFTW_READ_WISDOM_CACHE=oN;ITK_FFTW_WRITE_WISDOM_CACHE=oN;ITK_FFTW_WISDOM_CACHE_FILE=${ITK_TEST_OUTPUT_DIR}/.wisdom_from_ITK_FFTW_WISDOM_CACHE_FILE;ITK_FFTW_PLAN_RIGOR=FFTW_EXHAUSTIVE") endif() if(ITK_USE_FFTWD) itk_add_test(NAME itkFFTWD_FFTTest - COMMAND ITKFFTTestDriver itkFFTWD_FFTTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKFFTTestDriver itkFFTWD_FFTTest ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkFFTWD_RealFFTTest - COMMAND ITKFFTTestDriver itkFFTWD_RealFFTTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKFFTTestDriver itkFFTWD_RealFFTTest ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkVnlFFTWD_FFTTest COMMAND ITKFFTTestDriver itkVnlFFTWD_FFTTest) itk_add_test(NAME itkVnlFFTWD_RealFFTTest @@ -320,7 +320,7 @@ itk_add_test(NAME itkVnlForward1DFFTImageFilterTest ${ITK_TEST_OUTPUT_DIR}/itkVnlForward1DFFTImageFilterTestOutput 1 ) -itk_add_test( NAME itkVnlInverse1DFFTImageFilterTest +itk_add_test(NAME itkVnlInverse1DFFTImageFilterTest COMMAND ITKFFTTestDriver --compare DATA{Input/TreeBarkTexture.png} diff --git a/Modules/Filtering/FastMarching/test/CMakeLists.txt b/Modules/Filtering/FastMarching/test/CMakeLists.txt index 2788d256f06..65a353a474f 100644 --- a/Modules/Filtering/FastMarching/test/CMakeLists.txt +++ b/Modules/Filtering/FastMarching/test/CMakeLists.txt @@ -35,12 +35,12 @@ itk_add_test(NAME itkFastMarchingUpwindGradientTest COMMAND ITKFastMarchingTestDriver itkFastMarchingUpwindGradientTest) itk_add_test(NAME itkFastMarchingBaseTest0 - COMMAND ITKFastMarchingTestDriver itkFastMarchingBaseTest 0 ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingBaseTest 0) itk_add_test(NAME itkFastMarchingBaseTest1 - COMMAND ITKFastMarchingTestDriver itkFastMarchingBaseTest 1 ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingBaseTest 1) itk_add_test(NAME itkFastMarchingImageFilterBaseTest - COMMAND ITKFastMarchingTestDriver itkFastMarchingImageFilterBaseTest ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingImageFilterBaseTest) itk_add_test(NAME itkFastMarchingImageFilterRealTest1 COMMAND ITKFastMarchingTestDriver itkFastMarchingImageFilterRealTest1) @@ -50,34 +50,34 @@ itk_add_test(NAME itkFastMarchingImageFilterRealTest2 itk_add_test(NAME itkFastMarchingImageFilterRealWithNumberOfElementsTest COMMAND ITKFastMarchingTestDriver - itkFastMarchingImageFilterRealWithNumberOfElementsTest ) + itkFastMarchingImageFilterRealWithNumberOfElementsTest) itk_add_test(NAME itkFastMarchingUpwindGradientBaseTest - COMMAND ITKFastMarchingTestDriver itkFastMarchingUpwindGradientBaseTest ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingUpwindGradientBaseTest) itk_add_test(NAME itkFastMarchingQuadEdgeMeshFilterBaseTest - COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest) itk_add_test(NAME itkFastMarchingQuadEdgeMeshFilterBaseTest2 - COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest2 ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest2) itk_add_test(NAME itkFastMarchingQuadEdgeMeshFilterBaseTest3 - COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest3 ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest3) itk_add_test(NAME itkFastMarchingQuadEdgeMeshFilterBaseTest4 - COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest4 ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterBaseTest4) itk_add_test(NAME itkFastMarchingQuadEdgeMeshFilterWithNumberOfElementsTest - COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterWithNumberOfElementsTest ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingQuadEdgeMeshFilterWithNumberOfElementsTest) itk_add_test(NAME itkFastMarchingStoppingCriterionBaseTest - COMMAND ITKFastMarchingTestDriver itkFastMarchingStoppingCriterionBaseTest ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingStoppingCriterionBaseTest) itk_add_test(NAME itkFastMarchingThresholdStoppingCriterionTest - COMMAND ITKFastMarchingTestDriver itkFastMarchingThresholdStoppingCriterionTest ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingThresholdStoppingCriterionTest) itk_add_test(NAME itkFastMarchingNumberOfElementsStoppingCriterionTest - COMMAND ITKFastMarchingTestDriver itkFastMarchingNumberOfElementsStoppingCriterionTest ) + COMMAND ITKFastMarchingTestDriver itkFastMarchingNumberOfElementsStoppingCriterionTest) # ------------------------------------------------------------------------- # Topology constrained front propagation @@ -150,7 +150,7 @@ itk_add_test(NAME itkFastMarchingImageFilterTest_Brain2D_multipleSeeds_StrictTop 1 ) -itk_add_test( NAME itkFastMarchingImageFilterTest_Brain2D_multipleSeeds_NoHandlesTopo +itk_add_test(NAME itkFastMarchingImageFilterTest_Brain2D_multipleSeeds_NoHandlesTopo COMMAND ITKFastMarchingTestDriver --compare DATA{Baseline/BrainProtonDensitySlice_multipleSeeds_NoHandlesTopo_out.nii.gz} ${ITK_TEST_OUTPUT_DIR}/test_Brain2D_multipleSeeds_NoHandlesTopo.nii.gz @@ -165,7 +165,7 @@ itk_add_test( NAME itkFastMarchingImageFilterTest_Brain2D_multipleSeeds_NoHandle # ************************************************************************ # 3D -itk_add_test( NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_NoTopo +itk_add_test(NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_NoTopo COMMAND ITKFastMarchingTestDriver --compare DATA{Baseline/torus_multipleSeeds_NoTopo_out.nii.gz} ${ITK_TEST_OUTPUT_DIR}/test_torus_multipleSeeds_NoTopo.nii.gz @@ -178,7 +178,7 @@ itk_add_test( NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_NoTopo 0 ) -itk_add_test( NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_StrictTopo +itk_add_test(NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_StrictTopo COMMAND ITKFastMarchingTestDriver --compare DATA{Baseline/torus_multipleSeeds_StrictTopo_out.nii.gz} ${ITK_TEST_OUTPUT_DIR}/test_torus_multipleSeeds_StrictTopo.nii.gz @@ -191,7 +191,7 @@ itk_add_test( NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_StrictTopo 1 ) -itk_add_test( NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_NoHandlesTopo +itk_add_test(NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_NoHandlesTopo COMMAND ITKFastMarchingTestDriver --compare DATA{Baseline/torus_multipleSeeds_NoHandlesTopo_out.nii.gz} ${ITK_TEST_OUTPUT_DIR}/test_torus_multipleSeeds_NoHandlesTopo.nii.gz @@ -204,7 +204,7 @@ itk_add_test( NAME itkFastMarchingImageFilterTest_torus_multipleSeeds_NoHandlesT 2 ) -itk_add_test( NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_NoTopo +itk_add_test(NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_NoTopo COMMAND ITKFastMarchingTestDriver --compare DATA{Baseline/wm_multipleSeeds_NoTopo_out.nii.gz} ${ITK_TEST_OUTPUT_DIR}/test_wm_multipleSeeds_NoTopo.nii.gz @@ -218,7 +218,7 @@ itk_add_test( NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_NoTopo ) set_property(TEST itkFastMarchingImageFilterTest_wm_multipleSeeds_NoTopo APPEND PROPERTY LABELS RUNS_LONG) -itk_add_test( NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_StrictTopo +itk_add_test(NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_StrictTopo COMMAND ITKFastMarchingTestDriver --compare DATA{Baseline/wm_multipleSeeds_StrictTopo_out.nii.gz} ${ITK_TEST_OUTPUT_DIR}/test_wm_multipleSeeds_StrictTopo.nii.gz @@ -232,7 +232,7 @@ itk_add_test( NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_StrictTopo ) set_property(TEST itkFastMarchingImageFilterTest_wm_multipleSeeds_StrictTopo APPEND PROPERTY LABELS RUNS_LONG) -itk_add_test( NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_NoHandlesTopo +itk_add_test(NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_NoHandlesTopo COMMAND ITKFastMarchingTestDriver --compare DATA{Baseline/wm_multipleSeeds_NoHandlesTopo_out.nii.gz} ${ITK_TEST_OUTPUT_DIR}/test_wm_multipleSeeds_NoHandlesTopo.nii.gz diff --git a/Modules/Filtering/ImageGradient/test/CMakeLists.txt b/Modules/Filtering/ImageGradient/test/CMakeLists.txt index 12938691067..e1ca9f937d1 100644 --- a/Modules/Filtering/ImageGradient/test/CMakeLists.txt +++ b/Modules/Filtering/ImageGradient/test/CMakeLists.txt @@ -24,7 +24,7 @@ itk_add_test(NAME itkGradientImageFilterTest2 --compare DATA{${ITK_DATA_ROOT}/Baseline/Filtering/GradientMagnitudeImageFilterTest2.mha} ${ITK_TEST_OUTPUT_DIR}/GradientMagnitudeImageFilterTest2.mha itkGradientImageFilterTest2 - DATA{${ITK_DATA_ROOT}/Input/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/GradientMagnitudeImageFilterTest2.mha ) + DATA{${ITK_DATA_ROOT}/Input/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/GradientMagnitudeImageFilterTest2.mha) itk_add_test(NAME itkVectorGradientMagnitudeImageFilterTest1a COMMAND ITKImageGradientTestDriver @@ -79,7 +79,7 @@ itk_add_test(NAME itkGradientRecursiveGaussianFilterTest3 ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest3d.nii.gz ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest3e.nii.gz ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest3f.nii.gz - ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest3g.nii.gz ) + ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest3g.nii.gz) itk_add_test(NAME itkGradientRecursiveGaussianFilterTest4 COMMAND ITKImageGradientTestDriver @@ -87,7 +87,7 @@ itk_add_test(NAME itkGradientRecursiveGaussianFilterTest4 ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest4.mha itkGradientRecursiveGaussianFilterTest4 DATA{${ITK_DATA_ROOT}/Input/cthead1.png} - ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest4.mha ) + ${ITK_TEST_OUTPUT_DIR}/itkGradientRecursiveGaussianFilterTest4.mha) itk_add_test(NAME itkDifferenceOfGaussiansGradientTest diff --git a/Modules/Filtering/ImageGrid/test/CMakeLists.txt b/Modules/Filtering/ImageGrid/test/CMakeLists.txt index 25368455289..2641106adec 100644 --- a/Modules/Filtering/ImageGrid/test/CMakeLists.txt +++ b/Modules/Filtering/ImageGrid/test/CMakeLists.txt @@ -67,9 +67,9 @@ CreateTestDriver(ITKImageGrid "${ITKImageGrid-Test_LIBRARIES}" "${ITKImageGridT itk_add_test(NAME itkBasicArchitectureTest COMMAND ITKImageGridTestDriver itkBasicArchitectureTest) itk_add_test(NAME itkBinShrinkImageFilterTest1 - COMMAND ${itk-module}TestDriver itkBinShrinkImageFilterTest1 ) + COMMAND ${itk-module}TestDriver itkBinShrinkImageFilterTest1) itk_add_test(NAME itkBinShrinkImageFilterTest2 - COMMAND ${itk-module}TestDriver itkBinShrinkImageFilterTest2 ) + COMMAND ${itk-module}TestDriver itkBinShrinkImageFilterTest2) itk_add_test(NAME itkBSplineScatteredDataPointSetToImageFilterTest01 COMMAND ITKImageGridTestDriver --compare DATA{Baseline/itkBSplineScatteredDataPointSetToImageFilterTest01.mha} @@ -116,25 +116,25 @@ itk_add_test(NAME itkCyclicReferences COMMAND ITKImageGridTestDriver itkCyclicReferences) itk_add_test(NAME itkCyclicShiftImageFilterTest0 COMMAND ITKImageGridTestDriver - itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 0 0 ) + itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 0 0) itk_add_test(NAME itkCyclicShiftImageFilterTest1 COMMAND ITKImageGridTestDriver - itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 256 256 ) + itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 256 256) itk_add_test(NAME itkCyclicShiftImageFilterTest2 COMMAND ITKImageGridTestDriver - itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 40 0 ) + itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 40 0) itk_add_test(NAME itkCyclicShiftImageFilterTest3 COMMAND ITKImageGridTestDriver - itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 0 40 ) + itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 0 40) itk_add_test(NAME itkCyclicShiftImageFilterTest4 COMMAND ITKImageGridTestDriver - itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 40 40 ) + itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 40 40) itk_add_test(NAME itkCyclicShiftImageFilterTest5 COMMAND ITKImageGridTestDriver - itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 128 128 ) + itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 128 128) itk_add_test(NAME itkCyclicShiftImageFilterTest6 COMMAND ITKImageGridTestDriver - itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} -51 40 ) + itkCyclicShiftImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} -51 40) itk_add_test(NAME itkInterpolateImagePointsFilterTest COMMAND ITKImageGridTestDriver itkInterpolateImagePointsFilterTest) itk_add_test(NAME itkCropImageFilterTest @@ -329,7 +329,7 @@ itk_add_test(NAME itkSliceBySliceImageFilterDimension2Test itk_add_test(NAME itkPadImageFilterTest COMMAND ITKImageGridTestDriver itkPadImageFilterTest) -set( ITKImageGridGTests +set(ITKImageGridGTests itkResampleImageFilterGTest.cxx itkSliceImageFilterTest.cxx itkTileImageFilterGTest.cxx diff --git a/Modules/Filtering/ImageIntensity/src/CMakeLists.txt b/Modules/Filtering/ImageIntensity/src/CMakeLists.txt index 4c825aa8fc8..ce5457abb74 100644 --- a/Modules/Filtering/ImageIntensity/src/CMakeLists.txt +++ b/Modules/Filtering/ImageIntensity/src/CMakeLists.txt @@ -2,4 +2,4 @@ set(ITKImageIntensity_SRCS itkSymmetricEigenAnalysisImageFilter.cxx ) ### generating libraries -itk_module_add_library( ITKImageIntensity ${ITKImageIntensity_SRCS}) +itk_module_add_library(ITKImageIntensity ${ITKImageIntensity_SRCS}) diff --git a/Modules/Filtering/ImageIntensity/test/CMakeLists.txt b/Modules/Filtering/ImageIntensity/test/CMakeLists.txt index a16bf4028d0..9d68f3d596e 100644 --- a/Modules/Filtering/ImageIntensity/test/CMakeLists.txt +++ b/Modules/Filtering/ImageIntensity/test/CMakeLists.txt @@ -343,7 +343,7 @@ itk_add_test(NAME itkMagnitudeAndPhaseToComplexImageFilterTest itkMagnitudeAndPhaseToComplexImageFilterTest DATA{Input/itkBrainSliceComplexMagnitude.mha} DATA{Input/itkBrainSliceComplexPhase.mha} - ${ITK_TEST_OUTPUT_DIR}/itkMagnitudeAndPhaseToComplexImageFilterTest.mha ) + ${ITK_TEST_OUTPUT_DIR}/itkMagnitudeAndPhaseToComplexImageFilterTest.mha) set(ITKImageIntensityGTests diff --git a/Modules/Filtering/ImageNoise/test/CMakeLists.txt b/Modules/Filtering/ImageNoise/test/CMakeLists.txt index 5570e9da927..22312ff6747 100644 --- a/Modules/Filtering/ImageNoise/test/CMakeLists.txt +++ b/Modules/Filtering/ImageNoise/test/CMakeLists.txt @@ -31,7 +31,7 @@ itk_add_test(NAME itkShotNoiseImageFilterTest itkShotNoiseImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/itkShotNoiseImageFilterTest.png - 0.105 ) + 0.105) itk_add_test(NAME itkShotNoiseImageFilterTestPSNR COMMAND ITKImageNoiseTestDriver itkPeakSignalToNoiseRatioCalculatorTest diff --git a/Modules/Filtering/ImageSources/test/CMakeLists.txt b/Modules/Filtering/ImageSources/test/CMakeLists.txt index c48747f5203..c7a2adb5f61 100644 --- a/Modules/Filtering/ImageSources/test/CMakeLists.txt +++ b/Modules/Filtering/ImageSources/test/CMakeLists.txt @@ -77,4 +77,4 @@ itk_add_test(NAME itkPhysicalPointImageSourceTest4 --compareIntensityTolerance .0001 --compare DATA{${ITK_DATA_ROOT}/Baseline/Filtering/itkPhysicalPointImageSourceTest4.nrrd} ${ITK_TEST_OUTPUT_DIR}/itkPhysicalPointImageSourceTest4.nrrd - itkPhysicalPointImageSourceTest ${ITK_TEST_OUTPUT_DIR}/itkPhysicalPointImageSourceTest4.nrrd 3 0.785398163 ) + itkPhysicalPointImageSourceTest ${ITK_TEST_OUTPUT_DIR}/itkPhysicalPointImageSourceTest4.nrrd 3 0.785398163) diff --git a/Modules/Filtering/ImageStatistics/test/CMakeLists.txt b/Modules/Filtering/ImageStatistics/test/CMakeLists.txt index 1f97609de05..6e73d17b59d 100644 --- a/Modules/Filtering/ImageStatistics/test/CMakeLists.txt +++ b/Modules/Filtering/ImageStatistics/test/CMakeLists.txt @@ -47,12 +47,12 @@ itk_add_test(NAME itkLabelStatisticsImageFilterTest_2 COMMAND ITKImageStatisticsTestDriver itkLabelStatisticsImageFilterTest DATA{${ITK_DATA_ROOT}/Input/peppers.png} DATA{${ITK_DATA_ROOT}/Baseline/Algorithms/OtsuMultipleThresholdsImageFilterTest.png} - 1 10 ) + 1 10) itk_add_test(NAME itkLabelStatisticsImageFilterTest_3 COMMAND ITKImageStatisticsTestDriver itkLabelStatisticsImageFilterTest DATA{${ITK_DATA_ROOT}/Input/peppers.png} DATA{${ITK_DATA_ROOT}/Baseline/Algorithms/OtsuMultipleThresholdsImageFilterTest.png} - 1 20 ) + 1 20) itk_add_test(NAME itkSumProjectionImageFilterTest COMMAND ITKImageStatisticsTestDriver --compare DATA{${ITK_DATA_ROOT}/Baseline/BasicFilters/HeadMRVolumeSumProjection.tif} @@ -174,11 +174,11 @@ itk_add_test(NAME itkProjectionImageFilterTest1 ${ITK_TEST_OUTPUT_DIR}/HeadMRVolumeProjection100.tif itkProjectionImageFilterTest DATA{${ITK_DATA_ROOT}/Input/HeadMRVolume.mhd,HeadMRVolume.raw} ${ITK_TEST_OUTPUT_DIR}/HeadMRVolumeProjection100.tif 100 0) -itk_add_test( NAME itkLabelOverlapMeasuresImageFilterTest +itk_add_test(NAME itkLabelOverlapMeasuresImageFilterTest COMMAND ITKImageStatisticsTestDriver itkLabelOverlapMeasuresImageFilterTest 2 DATA{Input/sourceImage.nii.gz} - DATA{Input/targetImage.nii.gz} ) + DATA{Input/targetImage.nii.gz}) set(ITKImageStatisticsGTests itkMinimumMaximumImageFilterGTest.cxx) diff --git a/Modules/Filtering/LabelMap/src/CMakeLists.txt b/Modules/Filtering/LabelMap/src/CMakeLists.txt index b2a05b60624..e3a4fa776ac 100644 --- a/Modules/Filtering/LabelMap/src/CMakeLists.txt +++ b/Modules/Filtering/LabelMap/src/CMakeLists.txt @@ -3,4 +3,4 @@ set(ITKLabelMap_SRCS itkMergeLabelMapFilter.cxx ) ### generating libraries -itk_module_add_library( ITKLabelMap ${ITKLabelMap_SRCS}) +itk_module_add_library(ITKLabelMap ${ITKLabelMap_SRCS}) diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/CMakeLists.txt b/Modules/Filtering/QuadEdgeMeshFiltering/test/CMakeLists.txt index 62f13ae108d..d83ad7d8985 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/test/CMakeLists.txt +++ b/Modules/Filtering/QuadEdgeMeshFiltering/test/CMakeLists.txt @@ -73,8 +73,8 @@ itk_add_test(NAME itkSmoothingQuadEdgeMeshFilterTest1 itkSmoothingQuadEdgeMeshFilterTest DATA{${INPUTDATA}/genusZeroSurface01.vtk} 10 0.1 1 ${TEMP}/temp_SmoothResult1.vtk) -set( CURV_TESTS Gaussian Maximum Mean Minimum ) -foreach( loop_var ${CURV_TESTS} ) +set(CURV_TESTS Gaussian Maximum Mean Minimum) +foreach(loop_var ${CURV_TESTS}) itk_add_test(NAME itkDiscrete${loop_var}CurvatureQuadEdgeMeshFilterTest COMMAND ITKQuadEdgeMeshFilteringTestDriver itkDiscrete${loop_var}CurvatureQuadEdgeMeshFilterTest @@ -113,7 +113,7 @@ itk_add_test(NAME itkNormalQuadEdgeMeshFilterTest2 COMMAND ITKQuadEdgeMeshFilteringTestDriver itkNormalQuadEdgeMeshFilterTest DATA{${INPUTDATA}/mushroom.vtk} 2) -foreach( area 0 1 ) +foreach(area 0 1) itk_add_test(NAME itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsArea${area}Test COMMAND ITKQuadEdgeMeshFilteringTestDriver itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsTest DATA{${INPUTDATA}/genusZeroSurface01.vtk} ${TEMP}/LaplacianDeformationSoftConstraintsOutput_area${area}.vtk ${area}) @@ -122,9 +122,9 @@ foreach( area 0 1 ) DATA{${INPUTDATA}/genusZeroSurface01.vtk} ${TEMP}/LaplacianDeformationHardConstraintsOutput_area${area}.vtk ${area}) endforeach() -foreach( border 0 1 ) - foreach( coeff 0 1 2 3 4 ) - foreach( solver 0 1 ) +foreach(border 0 1) + foreach(coeff 0 1 2 3 4) + foreach(solver 0 1) itk_add_test(NAME itkParameterizationQuadEdgeMeshFilterTestb${border}_c${coeff}_s${solver} COMMAND ITKQuadEdgeMeshFilteringTestDriver itkParameterizationQuadEdgeMeshFilterTest diff --git a/Modules/IO/BioRad/test/CMakeLists.txt b/Modules/IO/BioRad/test/CMakeLists.txt index 15610a08e7f..1184389e523 100644 --- a/Modules/IO/BioRad/test/CMakeLists.txt +++ b/Modules/IO/BioRad/test/CMakeLists.txt @@ -5,7 +5,7 @@ itkBioRadImageIOTest.cxx CreateTestDriver(ITKIOBioRad "${ITKIOBioRad-Test_LIBRARIES}" "${ITKIOBioRadTests}") -itk_add_test( NAME ITKBioRadImageIOTest +itk_add_test(NAME ITKBioRadImageIOTest COMMAND ITKIOBioRadTestDriver --compare DATA{Input/biorad.pic} ${ITK_TEST_OUTPUT_DIR}/biorad_new.pic - itkBioRadImageIOTest DATA{Input/biorad.pic} ${ITK_TEST_OUTPUT_DIR}/biorad_new.pic ) + itkBioRadImageIOTest DATA{Input/biorad.pic} ${ITK_TEST_OUTPUT_DIR}/biorad_new.pic) diff --git a/Modules/IO/Bruker/src/CMakeLists.txt b/Modules/IO/Bruker/src/CMakeLists.txt index 9ab6e4c9656..86fef417da0 100644 --- a/Modules/IO/Bruker/src/CMakeLists.txt +++ b/Modules/IO/Bruker/src/CMakeLists.txt @@ -3,4 +3,4 @@ set(ITKIOBruker2dseq_SRCS itkBruker2dseqImageIO.cxx ) -itk_module_add_library(ITKIOBruker ${ITKIOBruker2dseq_SRCS} ) +itk_module_add_library(ITKIOBruker ${ITKIOBruker2dseq_SRCS}) diff --git a/Modules/IO/Bruker/test/CMakeLists.txt b/Modules/IO/Bruker/test/CMakeLists.txt index b452e3f52b7..ecf97f9aa84 100644 --- a/Modules/IO/Bruker/test/CMakeLists.txt +++ b/Modules/IO/Bruker/test/CMakeLists.txt @@ -5,42 +5,42 @@ set(ITKIOBrukerTests CreateTestDriver(ITKIOBruker "${ITKIOBruker-Test_LIBRARIES}" "${ITKIOBrukerTests}") -ExternalData_Expand_Arguments( ITKData +ExternalData_Expand_Arguments(ITKData ExpandedData # Ignore output variable - DATA{Input/,RECURSE:,REGEX:.*} ) + DATA{Input/,RECURSE:,REGEX:.*}) -itk_add_test( NAME itkBruker2dseq_PV6.0_INT16 +itk_add_test(NAME itkBruker2dseq_PV6.0_INT16 COMMAND ITKIOBrukerTestDriver --compare ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_INT16.mha DATA{Baseline/PV6.0_FLASH_INT16.mha} itkBrukerImageTest DATA{Input/PV6.0_FLASH/pdata/1/2dseq} - ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_INT16.mha ) + ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_INT16.mha) -itk_add_test( NAME itkBruker2dseq_PV6.0_UINT8 +itk_add_test(NAME itkBruker2dseq_PV6.0_UINT8 COMMAND ITKIOBrukerTestDriver --compare ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_UINT8.mha DATA{Baseline/PV6.0_FLASH_UINT8.mha} itkBrukerImageTest DATA{Input/PV6.0_FLASH/pdata/2/2dseq} - ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_UINT8.mha ) + ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_UINT8.mha) -itk_add_test( NAME itkBruker2dseq_PV6.0_FLOAT32 +itk_add_test(NAME itkBruker2dseq_PV6.0_FLOAT32 COMMAND ITKIOBrukerTestDriver --compare ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_FLOAT32.mha DATA{Baseline/PV6.0_FLASH_FLOAT32.mha} itkBrukerImageTest DATA{Input/PV6.0_FLASH/pdata/2/2dseq} - ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_FLOAT32.mha ) + ${ITK_TEST_OUTPUT_DIR}/PV6.0_FLASH_FLOAT32.mha) -itk_add_test( NAME itkBruker2dseq_PV5.1_FSE_INT16 +itk_add_test(NAME itkBruker2dseq_PV5.1_FSE_INT16 COMMAND ITKIOBrukerTestDriver --compare ${ITK_TEST_OUTPUT_DIR}/PV5.1_FSE_INT16.mha DATA{Baseline/PV5.1_FSE_INT16.mha} itkBrukerImageTest DATA{Input/PV5.1_FSE/pdata/1/2dseq} - ${ITK_TEST_OUTPUT_DIR}/PV5.1_FSE_INT16.mha ) + ${ITK_TEST_OUTPUT_DIR}/PV5.1_FSE_INT16.mha) diff --git a/Modules/IO/CSV/test/CMakeLists.txt b/Modules/IO/CSV/test/CMakeLists.txt index 34832bf85a0..64950620998 100644 --- a/Modules/IO/CSV/test/CMakeLists.txt +++ b/Modules/IO/CSV/test/CMakeLists.txt @@ -11,7 +11,7 @@ CreateTestDriver(ITKIOCSV "${ITKIOCSV-Test_LIBRARIES}" "${ITKIOCSVTests}") itk_add_test(NAME itkCSVArray2DFileReaderTest COMMAND ITKIOCSVTestDriver itkCSVArray2DFileReaderTest - DATA{Input/csvFileReaderTestInput.csv} ) + DATA{Input/csvFileReaderTestInput.csv}) itk_add_test(NAME itkCSVNumericObjectFileWriterTest COMMAND ITKIOCSVTestDriver itkCSVNumericObjectFileWriterTest ${TEMP}/NumericObjectToCSVFileWriterOutput.csv) diff --git a/Modules/IO/DCMTK/test/CMakeLists.txt b/Modules/IO/DCMTK/test/CMakeLists.txt index 5f80111bb2f..4669e507690 100644 --- a/Modules/IO/DCMTK/test/CMakeLists.txt +++ b/Modules/IO/DCMTK/test/CMakeLists.txt @@ -76,7 +76,7 @@ itk_add_test(NAME itkDCMTKImageIOOrthoDirTest itk_add_test(NAME itkDCMTKMultiFrame4DTest COMMAND ITKIODCMTKTestDriver itkDCMTKMultiFrame4DTest DATA{${ITK_DATA_ROOT}/Input/Philips_4D_DICOM.dcm} - ${ITK_TEST_OUTPUT_DIR}/Philips_4D_DICOM.nrrd ) + ${ITK_TEST_OUTPUT_DIR}/Philips_4D_DICOM.nrrd) itk_add_test(NAME itkDCMTKImageIONonSquareTest COMMAND ITKIODCMTKTestDriver diff --git a/Modules/IO/GDCM/test/CMakeLists.txt b/Modules/IO/GDCM/test/CMakeLists.txt index d3d0e754d35..741d3fe2db2 100644 --- a/Modules/IO/GDCM/test/CMakeLists.txt +++ b/Modules/IO/GDCM/test/CMakeLists.txt @@ -114,7 +114,7 @@ itk_add_test(NAME itkGDCMImageReadSeriesWriteTest itkGDCMImageReadSeriesWriteTest DATA{${ITK_DATA_ROOT}/Input/HeadMRVolume.mha} ${ITK_TEST_OUTPUT_DIR}/itkGDCMImageReadSeriesWriteTest - ${ITK_TEST_OUTPUT_DIR}/itkGDCMImageReadSeriesWriteTest.mha ) + ${ITK_TEST_OUTPUT_DIR}/itkGDCMImageReadSeriesWriteTest.mha) itk_add_test(NAME itkGDCMSeriesMissingDicomTagTest COMMAND ITKIOGDCMTestDriver itkGDCMSeriesMissingDicomTagTest diff --git a/Modules/IO/HDF5/test/CMakeLists.txt b/Modules/IO/HDF5/test/CMakeLists.txt index 5de3dfab2e9..c6615400593 100644 --- a/Modules/IO/HDF5/test/CMakeLists.txt +++ b/Modules/IO/HDF5/test/CMakeLists.txt @@ -7,6 +7,6 @@ set(ITKIOHDF5Tests CreateTestDriver(ITKIOHDF5 "${ITKIOHDF5-Test_LIBRARIES}" "${ITKIOHDF5Tests}") itk_add_test(NAME itkHDF5ImageIOTest - COMMAND ITKIOHDF5TestDriver itkHDF5ImageIOTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKIOHDF5TestDriver itkHDF5ImageIOTest ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkHDF5ImageIOStreamingReadWriteTest - COMMAND ITKIOHDF5TestDriver itkHDF5ImageIOStreamingReadWriteTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKIOHDF5TestDriver itkHDF5ImageIOStreamingReadWriteTest ${ITK_TEST_OUTPUT_DIR}) diff --git a/Modules/IO/ImageBase/test/CMakeLists.txt b/Modules/IO/ImageBase/test/CMakeLists.txt index 75b26e422af..8e63698d993 100644 --- a/Modules/IO/ImageBase/test/CMakeLists.txt +++ b/Modules/IO/ImageBase/test/CMakeLists.txt @@ -304,12 +304,12 @@ itk_add_test(NAME itkImageSeriesReaderVectorImageTest1 COMMAND ITKIOImageBaseTestDriver itkImageSeriesReaderVectorTest DATA{${ITK_DATA_ROOT}/Input/RGBTestImage.tif} DATA{${ITK_DATA_ROOT}/Input/RGBTestImage.tif} - DATA{${ITK_DATA_ROOT}/Input/RGBTestImage.tif} ) + DATA{${ITK_DATA_ROOT}/Input/RGBTestImage.tif}) itk_add_test(NAME itkImageSeriesReaderVectorImageTest2 COMMAND ITKIOImageBaseTestDriver itkImageSeriesReaderVectorTest DATA{${ITK_DATA_ROOT}/Input/48BitTestImage.tif} - DATA{${ITK_DATA_ROOT}/Input/48BitTestImage.tif} DATA{${ITK_DATA_ROOT}/Input/48BitTestImage.tif} ) + DATA{${ITK_DATA_ROOT}/Input/48BitTestImage.tif} DATA{${ITK_DATA_ROOT}/Input/48BitTestImage.tif}) itk_add_test(NAME itkImageSeriesWriterTest COMMAND ITKIOImageBaseTestDriver itkImageSeriesWriterTest DATA{${ITK_DATA_ROOT}/Input/DicomSeries/,REGEX:Image[0-9]+.dcm} diff --git a/Modules/IO/JPEG2000/test/CMakeLists.txt b/Modules/IO/JPEG2000/test/CMakeLists.txt index 7011e96bcfa..4267ae31bd9 100644 --- a/Modules/IO/JPEG2000/test/CMakeLists.txt +++ b/Modules/IO/JPEG2000/test/CMakeLists.txt @@ -24,9 +24,9 @@ itk_add_test(NAME itkJPEG2000Test02 itk_add_test(NAME itkJPEG2000Test03 COMMAND ITKIOJPEG2000TestDriver itkJPEG2000ImageIOTest03 ${ITK_TEST_OUTPUT_DIR}/Bretagne1_RegionTest01.tif ${ITK_TEST_OUTPUT_DIR}/Bretagne1_02.j2k) -set_tests_properties( itkJPEG2000Test03 PROPERTIES +set_tests_properties(itkJPEG2000Test03 PROPERTIES DEPENDS itkJPEG2000Test00 - REQUIRED_FILES ${ITK_TEST_OUTPUT_DIR}/Bretagne1_RegionTest01.tif ) + REQUIRED_FILES ${ITK_TEST_OUTPUT_DIR}/Bretagne1_RegionTest01.tif) itk_add_test(NAME itkJPEG2000Test05 COMMAND ITKIOJPEG2000TestDriver itkJPEG2000ImageIOTest05 diff --git a/Modules/IO/MINC/test/CMakeLists.txt b/Modules/IO/MINC/test/CMakeLists.txt index 826575b7b43..5e2c8431d5d 100644 --- a/Modules/IO/MINC/test/CMakeLists.txt +++ b/Modules/IO/MINC/test/CMakeLists.txt @@ -20,7 +20,7 @@ set(ITKIOMINCTests CreateTestDriver(ITKIOMINC "${ITKIOMINC-Test_LIBRARIES}" "${ITKIOMINCTests}") itk_add_test(NAME itkMINCImageIOTest1 - COMMAND ITKIOMINCTestDriver itkMINCImageIOTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKIOMINCTestDriver itkMINCImageIOTest ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkMINCImageIOTest2 COMMAND ITKIOMINCTestDriver itkMINCImageIOTest2 @@ -83,21 +83,21 @@ itk_add_test(NAME itkMINCImageIOTest-COM-t1_z+_float_yxz_nonorm COMMAND ITKIOMINCTestDriver --compare DATA{Input/t1_z+_float_yxz_nonorm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_float_yxz_nonorm.mnc itkMINCImageIOTest4 - DATA{Input/t1_z+_float_yxz_nonorm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_float_yxz_nonorm.mnc 427621.7839 -8.195741583 72.45998819 -3.148534512 ) + DATA{Input/t1_z+_float_yxz_nonorm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_float_yxz_nonorm.mnc 427621.7839 -8.195741583 72.45998819 -3.148534512) itk_add_test(NAME itkMINCImageIOTest-COM-t1_z+_float_yxz_norm COMMAND ITKIOMINCTestDriver --compare DATA{Input/t1_z+_float_yxz_norm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_float_yxz_norm.mnc itkMINCImageIOTest4 - DATA{Input/t1_z+_float_yxz_norm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_float_yxz_norm.mnc 427621.7839 -8.195741583 72.45998819 -3.148534512 ) + DATA{Input/t1_z+_float_yxz_norm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_float_yxz_norm.mnc 427621.7839 -8.195741583 72.45998819 -3.148534512) itk_add_test(NAME itkMINCImageIOTest-COM-t1_z+_ubyte_yxz_nonorm COMMAND ITKIOMINCTestDriver --compare DATA{Input/t1_z+_ubyte_yxz_nonorm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_ubyte_yxz_nonorm.mnc itkMINCImageIOTest4 - DATA{Input/t1_z+_ubyte_yxz_nonorm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_ubyte_yxz_nonorm.mnc 427621.7838 -8.195741583 72.45998819 -3.148534512 ) + DATA{Input/t1_z+_ubyte_yxz_nonorm.mnc} ${ITK_TEST_OUTPUT_DIR}/t1_z+_ubyte_yxz_nonorm.mnc 427621.7838 -8.195741583 72.45998819 -3.148534512) diff --git a/Modules/IO/Mesh/test/CMakeLists.txt b/Modules/IO/Mesh/test/CMakeLists.txt index 6d94ca5cb81..a6b1481fe0a 100644 --- a/Modules/IO/Mesh/test/CMakeLists.txt +++ b/Modules/IO/Mesh/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(ITKIOMeshTests itkMeshFileReadWriteTest.cxx ) -CreateTestDriver(ITKIOMesh "${ITKIOMesh-Test_LIBRARIES}" "${ITKIOMeshTests}" ) +CreateTestDriver(ITKIOMesh "${ITKIOMesh-Test_LIBRARIES}" "${ITKIOMeshTests}") itk_add_test(NAME itkMeshFileReadWriteTest01 COMMAND ITKIOMeshTestDriver itkMeshFileReadWriteTest diff --git a/Modules/IO/MeshBYU/test/CMakeLists.txt b/Modules/IO/MeshBYU/test/CMakeLists.txt index 7656b13b3a9..3e9a87198bc 100644 --- a/Modules/IO/MeshBYU/test/CMakeLists.txt +++ b/Modules/IO/MeshBYU/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(ITKIOMeshBYUTests itkMeshFileReadWriteTest.cxx ) -CreateTestDriver(ITKIOMeshBYU "${ITKIOMeshBYU-Test_LIBRARIES}" "${ITKIOMeshBYUTests}" ) +CreateTestDriver(ITKIOMeshBYU "${ITKIOMeshBYU-Test_LIBRARIES}" "${ITKIOMeshBYUTests}") itk_add_test(NAME itkMeshFileReadWriteTest06 COMMAND ITKIOMeshBYUTestDriver itkMeshFileReadWriteTest diff --git a/Modules/IO/MeshBase/test/CMakeLists.txt b/Modules/IO/MeshBase/test/CMakeLists.txt index 520007719c9..1b3c2ff698e 100644 --- a/Modules/IO/MeshBase/test/CMakeLists.txt +++ b/Modules/IO/MeshBase/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(ITKIOMeshBaseTests itkMeshFileReaderWriterTest.cxx ) -CreateTestDriver(ITKIOMeshBase "${ITKIOMeshBase-Test_LIBRARIES}" "${ITKIOMeshBaseTests}" ) +CreateTestDriver(ITKIOMeshBase "${ITKIOMeshBase-Test_LIBRARIES}" "${ITKIOMeshBaseTests}") itk_add_test(NAME itkMeshFileReaderWriterTest COMMAND ITKIOMeshBaseTestDriver itkMeshFileReaderWriterTest diff --git a/Modules/IO/MeshFreeSurfer/test/CMakeLists.txt b/Modules/IO/MeshFreeSurfer/test/CMakeLists.txt index df7a4f9c27a..fc04f2c0858 100644 --- a/Modules/IO/MeshFreeSurfer/test/CMakeLists.txt +++ b/Modules/IO/MeshFreeSurfer/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(ITKIOMeshFreeSurferTests itkMeshFileReadWriteTest.cxx ) -CreateTestDriver(ITKIOMeshFreeSurfer "${ITKIOMeshFreeSurfer-Test_LIBRARIES}" "${ITKIOMeshFreeSurferTests}" ) +CreateTestDriver(ITKIOMeshFreeSurfer "${ITKIOMeshFreeSurfer-Test_LIBRARIES}" "${ITKIOMeshFreeSurferTests}") itk_add_test(NAME itkMeshFileReadWriteTestFreeSurfer1 COMMAND ITKIOMeshFreeSurferTestDriver itkMeshFileReadWriteTest diff --git a/Modules/IO/MeshGifti/test/CMakeLists.txt b/Modules/IO/MeshGifti/test/CMakeLists.txt index b3ea0c57318..d441b140841 100644 --- a/Modules/IO/MeshGifti/test/CMakeLists.txt +++ b/Modules/IO/MeshGifti/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(ITKIOMeshGiftiTests itkMeshFileReadWriteTest.cxx ) -CreateTestDriver(ITKIOMeshGifti "${ITKIOMeshGifti-Test_LIBRARIES}" "${ITKIOMeshGiftiTests}" ) +CreateTestDriver(ITKIOMeshGifti "${ITKIOMeshGifti-Test_LIBRARIES}" "${ITKIOMeshGiftiTests}") itk_add_test(NAME itkMeshFileReadWriteTestGifti1 COMMAND ITKIOMeshGiftiTestDriver itkMeshFileReadWriteTest diff --git a/Modules/IO/MeshOBJ/test/CMakeLists.txt b/Modules/IO/MeshOBJ/test/CMakeLists.txt index 937517f15c2..7307af8378b 100644 --- a/Modules/IO/MeshOBJ/test/CMakeLists.txt +++ b/Modules/IO/MeshOBJ/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(ITKIOMeshOBJTests itkMeshFileReadWriteTest.cxx ) -CreateTestDriver(ITKIOMeshOBJ "${ITKIOMeshOBJ-Test_LIBRARIES}" "${ITKIOMeshOBJTests}" ) +CreateTestDriver(ITKIOMeshOBJ "${ITKIOMeshOBJ-Test_LIBRARIES}" "${ITKIOMeshOBJTests}") itk_add_test(NAME itkMeshFileReadWriteOBJTest COMMAND ITKIOMeshTestDriver itkMeshFileReadWriteTest diff --git a/Modules/IO/MeshOFF/test/CMakeLists.txt b/Modules/IO/MeshOFF/test/CMakeLists.txt index 7980100cb00..848724f9120 100644 --- a/Modules/IO/MeshOFF/test/CMakeLists.txt +++ b/Modules/IO/MeshOFF/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(ITKIOMeshOFFTests itkMeshFileReadWriteTest.cxx ) -CreateTestDriver(ITKIOMeshOFF "${ITKIOMeshOFF-Test_LIBRARIES}" "${ITKIOMeshOFFTests}" ) +CreateTestDriver(ITKIOMeshOFF "${ITKIOMeshOFF-Test_LIBRARIES}" "${ITKIOMeshOFFTests}") itk_add_test(NAME itkMeshFileReadWriteOFFTest COMMAND ITKIOMeshTestDriver itkMeshFileReadWriteTest diff --git a/Modules/IO/MeshVTK/test/CMakeLists.txt b/Modules/IO/MeshVTK/test/CMakeLists.txt index 29f5ba458ee..9b407df0bc2 100644 --- a/Modules/IO/MeshVTK/test/CMakeLists.txt +++ b/Modules/IO/MeshVTK/test/CMakeLists.txt @@ -8,7 +8,7 @@ set(ITKIOMeshVTKTests itkVTKPolyDataMeshCanReadImageTest.cxx ) -CreateTestDriver(ITKIOMeshVTK "${ITKIOMeshVTK-Test_LIBRARIES}" "${ITKIOMeshVTKTests}" ) +CreateTestDriver(ITKIOMeshVTK "${ITKIOMeshVTK-Test_LIBRARIES}" "${ITKIOMeshVTKTests}") itk_add_test(NAME itkMeshFileReadWriteTest00 COMMAND ITKIOMeshVTKTestDriver itkMeshFileReadWriteTest diff --git a/Modules/IO/Meta/test/CMakeLists.txt b/Modules/IO/Meta/test/CMakeLists.txt index 4a9d547b11a..0ba04970ab8 100644 --- a/Modules/IO/Meta/test/CMakeLists.txt +++ b/Modules/IO/Meta/test/CMakeLists.txt @@ -139,22 +139,22 @@ itk_add_test(NAME itkMetaImageStreamingWriterIOTest2 itk_add_test(NAME itkMetaTestLongFilename COMMAND ITKIOMetaTestDriver itkMetaTestLongFilename) -if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5 ) +if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5) # Image of 1.67 Gigabytes (pixels size is 16bits) itk_add_test(NAME itkLargeMetaImageWriteReadTest1 COMMAND ITKIOMetaTestDriver - itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage01.mhd 30000L ) + itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage01.mhd 30000L) # Image of 2.98 Gigabytes (pixels size is 16bits) itk_add_test(NAME itkLargeMetaImageWriteReadTest2 COMMAND ITKIOMetaTestDriver - itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage02.mhd 40000L ) + itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage02.mhd 40000L) # Image of 4.9 Gigabytes (pixels size is 8-bits out and 16-bit in) itk_add_test(NAME itkLargeMetaImageWriteReadTest3 COMMAND ITKIOMetaTestDriver - itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage03.mhd 50000L ) + itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage03.mhd 50000L) # Due to the large memory requirements this tests must be run one by one set_tests_properties(itkLargeMetaImageWriteReadTest1 @@ -171,12 +171,12 @@ if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5 ) endif() -if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 12 ) +if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 12) # Image of 9.12 Gigabytes (pixels size is 16bits) itk_add_test(NAME itkLargeMetaImageWriteReadTest4 COMMAND ITKIOMetaTestDriver - itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage04.mhd 70000L ) + itkLargeMetaImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage04.mhd 70000L) # Due to the large memory requirements this tests must be run one by one set_tests_properties(itkLargeMetaImageWriteReadTest4 diff --git a/Modules/IO/NIFTI/test/CMakeLists.txt b/Modules/IO/NIFTI/test/CMakeLists.txt index 5c8176bd429..250984b6ce7 100644 --- a/Modules/IO/NIFTI/test/CMakeLists.txt +++ b/Modules/IO/NIFTI/test/CMakeLists.txt @@ -18,7 +18,7 @@ itkExtractSlice.cxx ) # For itkNiftiImageIOTest.h. -include_directories( ${ITKIONIFTI_SOURCE_DIR}/test ) +include_directories(${ITKIONIFTI_SOURCE_DIR}/test) add_library(ITKIONIFTI-TestSupport itkNiftiImageIOTestHelper.cxx) itk_module_target_label(ITKIONIFTI-TestSupport) @@ -56,7 +56,7 @@ itk_add_test(NAME itkNiftiIOShouldSucceed COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest2 ${ITK_TEST_OUTPUT_DIR} itkNiftiIOShouldSucceed true DATA{${ITK_DATA_ROOT}/Input/LittleEndian.hdr,LittleEndian.mhd,LittleEndian.img}) itk_add_test(NAME itkDirCosinesTest - COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest4 ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest4 ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkNiftiSlopeInterceptTest COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest5 ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkNiftiVectorImageTest2 @@ -70,13 +70,13 @@ itk_add_test(NAME itkNiftiRGBImageTest itk_add_test(NAME itkNiftiRGBAImageTest COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest10 ${ITK_TEST_OUTPUT_DIR} RGBAImage.nii.gz) itk_add_test(NAME itkNiftiVectorImageTest - COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest3 ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest3 ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkNiftiDimensionLimitsTest - COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest11 ${ITK_TEST_OUTPUT_DIR} SizeFailure.nii.gz ) + COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest11 ${ITK_TEST_OUTPUT_DIR} SizeFailure.nii.gz) itk_add_test(NAME itkNiftiLargeRGBTest - COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest12 ${ITK_TEST_OUTPUT_DIR} LargeRGBImage.nii.gz ) + COMMAND ITKIONIFTITestDriver itkNiftiImageIOTest12 ${ITK_TEST_OUTPUT_DIR} LargeRGBImage.nii.gz) itk_add_test(NAME itkNiftiReadAnalyzeTest - COMMAND ITKIONIFTITestDriver itkNiftiReadAnalyzeTest ${ITK_TEST_OUTPUT_DIR} ) + COMMAND ITKIONIFTITestDriver itkNiftiReadAnalyzeTest ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkExtractSliceSlopeInterceptUCHAR COMMAND ITKIONIFTITestDriver --compare DATA{Baseline/SlopeInterceptUCHAR-midSlice.nrrd} ${ITK_TEST_OUTPUT_DIR}/SlopeInterceptUCHAR-midSlice.nrrd itkExtractSlice DATA{Input/SlopeInterceptUCHAR.nii.gz} ${ITK_TEST_OUTPUT_DIR}/SlopeInterceptUCHAR-midSlice.nrrd) diff --git a/Modules/IO/NRRD/test/CMakeLists.txt b/Modules/IO/NRRD/test/CMakeLists.txt index c40decc8c76..8e5476ee376 100644 --- a/Modules/IO/NRRD/test/CMakeLists.txt +++ b/Modules/IO/NRRD/test/CMakeLists.txt @@ -17,7 +17,7 @@ itkNrrdMetaDataTest.cxx ) # For itkNrrdImageIOTest.h. -include_directories( ${ITKIONRRD_SOURCE_DIR} ) +include_directories(${ITKIONRRD_SOURCE_DIR}) CreateTestDriver(ITKIONRRD "${ITKIONRRD-Test_LIBRARIES}" "${ITKIONRRDTests}") diff --git a/Modules/IO/TIFF/test/CMakeLists.txt b/Modules/IO/TIFF/test/CMakeLists.txt index c56c5081b92..2f5b66469ee 100644 --- a/Modules/IO/TIFF/test/CMakeLists.txt +++ b/Modules/IO/TIFF/test/CMakeLists.txt @@ -165,17 +165,17 @@ itk_add_test(NAME itkTIFFImageIOTestUShortPlanarConfig2 itk_add_test(NAME itkTIFFImageIOInfoTest1 COMMAND ITKIOTIFFTestDriver itkTIFFImageIOInfoTest DATA{Input/single-channel.ome.tif}) -set_tests_properties( itkTIFFImageIOInfoTest1 +set_tests_properties(itkTIFFImageIOInfoTest1 PROPERTIES PASS_REGULAR_EXPRESSION "OME-XML metadata block") itk_add_test(NAME itkTIFFImageIOInfoTest2 COMMAND ITKIOTIFFTestDriver itkTIFFImageIOInfoTest DATA{Input/ps-separated.tif}) -set_tests_properties( itkTIFFImageIOInfoTest2 +set_tests_properties(itkTIFFImageIOInfoTest2 PROPERTIES PASS_REGULAR_EXPRESSION "2014:09:24 14:16:01") itk_add_test(NAME itkTIFFImageIOInfoTest3 COMMAND ITKIOTIFFTestDriver itkTIFFImageIOInfoTest DATA{Input/3d_spacing.tif}) -set_tests_properties( itkTIFFImageIOInfoTest3 +set_tests_properties(itkTIFFImageIOInfoTest3 PROPERTIES PASS_REGULAR_EXPRESSION "17 19 1") @@ -210,22 +210,22 @@ foreach(f ${CompressionFiles}) endforeach() ###################### -if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5 ) +if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5) # Image of 1.67 Gigabytes (pixels size is 16bits) itk_add_test(NAME itkLargeTIFFImageWriteReadTest1 COMMAND ITKIOTIFFTestDriver - itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage01.tif 30000L ) + itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage01.tif 30000L) # Image of 2.98 Gigabytes (pixels size is 16bits) itk_add_test(NAME itkLargeTIFFImageWriteReadTest2 COMMAND ITKIOTIFFTestDriver - itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage02.tif 40000L ) + itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage02.tif 40000L) # Image of 4.9 Gigabytes (pixels size is 8-bits out and 16-bit in) itk_add_test(NAME itkLargeTIFFImageWriteReadTest3 COMMAND ITKIOTIFFTestDriver - itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage03.tif 50000L ) + itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage03.tif 50000L) # Due to the large memory requirements this tests must be run one by one set_tests_properties(itkLargeTIFFImageWriteReadTest1 @@ -244,12 +244,12 @@ if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5 ) endif() -if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 12 ) +if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 12) # Image of 9.12 Gigabytes (pixels size is 16bits) itk_add_test(NAME itkLargeTIFFImageWriteReadTest4 COMMAND ITKIOTIFFTestDriver - itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage04.tif 70000L ) + itkLargeTIFFImageWriteReadTest ${ITK_TEST_OUTPUT_DIR}/LargeImage04.tif 70000L) # Due to the large memory requirements this tests must lock the memory size resource set_tests_properties(itkLargeTIFFImageWriteReadTest4 diff --git a/Modules/IO/TransformInsightLegacy/test/CMakeLists.txt b/Modules/IO/TransformInsightLegacy/test/CMakeLists.txt index 65fecb425cb..db583f42ffb 100644 --- a/Modules/IO/TransformInsightLegacy/test/CMakeLists.txt +++ b/Modules/IO/TransformInsightLegacy/test/CMakeLists.txt @@ -8,7 +8,7 @@ CreateTestDriver(ITKIOTransformInsightLegacy "${ITKIOTransformInsightLegacy-Test itk_add_test(NAME itkIOTransformTxtTest COMMAND ITKIOTransformInsightLegacyTestDriver itkIOTransformTxtTest - ${ITK_TEST_OUTPUT_DIR} ) + ${ITK_TEST_OUTPUT_DIR}) itk_add_test(NAME itkIOTransformEuler3DTxtTest COMMAND ITKIOTransformInsightLegacyTestDriver itkIOEuler3DTransformTxtTest diff --git a/Modules/IO/TransformMINC/test/CMakeLists.txt b/Modules/IO/TransformMINC/test/CMakeLists.txt index 6bf6459a0ac..503a79a15b3 100644 --- a/Modules/IO/TransformMINC/test/CMakeLists.txt +++ b/Modules/IO/TransformMINC/test/CMakeLists.txt @@ -14,7 +14,7 @@ set(ITKIOTransformMINCTests ) CreateTestDriver(ITKIOTransformMINC "${ITKIOTransformMINC-Test_LIBRARIES}" "${ITKIOTransformMINCTests}") - target_link_libraries(ITKIOTransformMINCTestDriver LINK_PUBLIC ITKIOTransformBase ) + target_link_libraries(ITKIOTransformMINCTestDriver LINK_PUBLIC ITKIOTransformBase) itk_add_test(NAME itkIOTransformMINCTest COMMAND ITKIOTransformMINCTestDriver itkIOTransformMINCTest) diff --git a/Modules/Nonunit/Review/test/CMakeLists.txt b/Modules/Nonunit/Review/test/CMakeLists.txt index 74330afe217..40e6391d0f3 100644 --- a/Modules/Nonunit/Review/test/CMakeLists.txt +++ b/Modules/Nonunit/Review/test/CMakeLists.txt @@ -122,7 +122,7 @@ itk_add_test(NAME itkGridForwardWarpImageFilterTest COMMAND ITKReviewTestDriver --compare-MD5 ${ITK_TEST_OUTPUT_DIR}/itkGridForwardWarpImageFilterTest.mha 7dea362b3fac8e00956a4952a3d4f474 - itkGridForwardWarpImageFilterTest ${ITK_TEST_OUTPUT_DIR}/itkGridForwardWarpImageFilterTest.mha ) + itkGridForwardWarpImageFilterTest ${ITK_TEST_OUTPUT_DIR}/itkGridForwardWarpImageFilterTest.mha) itk_add_test(NAME itkImageFunctionTest COMMAND ITKReviewTestDriver itkImageFunctionTest) itk_add_test(NAME itkLabelGeometryImageFilterTest diff --git a/Modules/Numerics/FEM/CMakeLists.txt b/Modules/Numerics/FEM/CMakeLists.txt index 7dda297731c..8885b03a956 100644 --- a/Modules/Numerics/FEM/CMakeLists.txt +++ b/Modules/Numerics/FEM/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16.3) project(ITKFEM) set(ITKFEM_LIBRARIES ITKFEM) if(ITK_TEMPLATE_VISIBILITY_DEFAULT) - add_definitions( "-DVNL_TEMPLATE_EXPORT=__attribute__((visibility(\"default\")))") + add_definitions("-DVNL_TEMPLATE_EXPORT=__attribute__((visibility(\"default\")))") endif() if(NOT ITK_SOURCE_DIR) diff --git a/Modules/Numerics/Statistics/test/CMakeLists.txt b/Modules/Numerics/Statistics/test/CMakeLists.txt index c6db9bb42b9..ef1055dc759 100644 --- a/Modules/Numerics/Statistics/test/CMakeLists.txt +++ b/Modules/Numerics/Statistics/test/CMakeLists.txt @@ -207,13 +207,13 @@ set_tests_properties(itkKdTreeTest11 PROPERTIES ATTACHED_FILES_ON_FAIL ${TEMP}/i if(DOXYGEN_DOT_EXECUTABLE) itk_add_test(NAME itkKdTreeTest1Plot COMMAND ${DOXYGEN_DOT_EXECUTABLE} -Tpng -o ${ITK_TEST_OUTPUT_DIR}/itkKdTreeTest1_100.png ${ITK_TEST_OUTPUT_DIR}/itkKdTreeTest1_100.dot) -set_tests_properties( itkKdTreeTest1Plot PROPERTIES DEPENDS itkKdTreeTest1 ) +set_tests_properties(itkKdTreeTest1Plot PROPERTIES DEPENDS itkKdTreeTest1) itk_add_test(NAME itkKdTreeTest2Plot COMMAND ${DOXYGEN_DOT_EXECUTABLE} -Tpng -o ${ITK_TEST_OUTPUT_DIR}/itkKdTreeTest2.png ${ITK_TEST_OUTPUT_DIR}/itkKdTreeTest2.dot) -set_tests_properties( itkKdTreeTest2Plot PROPERTIES DEPENDS itkKdTreeTest2 ) +set_tests_properties(itkKdTreeTest2Plot PROPERTIES DEPENDS itkKdTreeTest2) itk_add_test(NAME itkKdTreeTest3Plot COMMAND ${DOXYGEN_DOT_EXECUTABLE} -Tpng -o ${ITK_TEST_OUTPUT_DIR}/itkKdTreeTest3.png ${ITK_TEST_OUTPUT_DIR}/itkKdTreeTest3.dot) -set_tests_properties( itkKdTreeTest3Plot PROPERTIES DEPENDS itkKdTreeTest3 ) +set_tests_properties(itkKdTreeTest3Plot PROPERTIES DEPENDS itkKdTreeTest3) endif() itk_add_test(NAME itkKdTreeTestSamplePoints diff --git a/Modules/Registration/Common/test/RegistrationITKv3/CMakeLists.txt b/Modules/Registration/Common/test/RegistrationITKv3/CMakeLists.txt index d1d337b3ced..c4eeb8dd9e1 100644 --- a/Modules/Registration/Common/test/RegistrationITKv3/CMakeLists.txt +++ b/Modules/Registration/Common/test/RegistrationITKv3/CMakeLists.txt @@ -1,72 +1,72 @@ project(ITKv3ImageRegistration) -add_executable(ITKv3ImageRegistration3 ImageRegistration3.cxx ) +add_executable(ITKv3ImageRegistration3 ImageRegistration3.cxx) target_link_libraries(ITKv3ImageRegistration3 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration5 ImageRegistration5.cxx ) +add_executable(ITKv3ImageRegistration5 ImageRegistration5.cxx) target_link_libraries(ITKv3ImageRegistration5 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration6 ImageRegistration6.cxx ) +add_executable(ITKv3ImageRegistration6 ImageRegistration6.cxx) target_link_libraries(ITKv3ImageRegistration6 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration8 ImageRegistration8.cxx ) +add_executable(ITKv3ImageRegistration8 ImageRegistration8.cxx) target_link_libraries(ITKv3ImageRegistration8 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration9 ImageRegistration9.cxx ) +add_executable(ITKv3ImageRegistration9 ImageRegistration9.cxx) target_link_libraries(ITKv3ImageRegistration9 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3DeformableRegistration4 DeformableRegistration4.cxx ) +add_executable(ITKv3DeformableRegistration4 DeformableRegistration4.cxx) target_link_libraries(ITKv3DeformableRegistration4 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration4 ImageRegistration4.cxx ) +add_executable(ITKv3ImageRegistration4 ImageRegistration4.cxx) target_link_libraries(ITKv3ImageRegistration4 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration7 ImageRegistration7.cxx ) +add_executable(ITKv3ImageRegistration7 ImageRegistration7.cxx) target_link_libraries(ITKv3ImageRegistration7 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration11 ImageRegistration11.cxx ) +add_executable(ITKv3ImageRegistration11 ImageRegistration11.cxx) target_link_libraries(ITKv3ImageRegistration11 "${ITKRegistrationCommon-Test_LIBRARIES}") # This example in getting stuck and timing out, likely due to spatial # object changes. if (TEST_DISABLED) -add_executable(ITKv3ImageRegistration12 ImageRegistration12.cxx ) +add_executable(ITKv3ImageRegistration12 ImageRegistration12.cxx) target_link_libraries(ITKv3ImageRegistration12 "${ITKRegistrationCommon-Test_LIBRARIES}") endif() -add_executable(ITKv3ImageRegistration13 ImageRegistration13.cxx ) +add_executable(ITKv3ImageRegistration13 ImageRegistration13.cxx) target_link_libraries(ITKv3ImageRegistration13 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration14 ImageRegistration14.cxx ) +add_executable(ITKv3ImageRegistration14 ImageRegistration14.cxx) target_link_libraries(ITKv3ImageRegistration14 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3DeformableRegistration6 DeformableRegistration6.cxx ) +add_executable(ITKv3DeformableRegistration6 DeformableRegistration6.cxx) target_link_libraries(ITKv3DeformableRegistration6 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3DeformableRegistration7 DeformableRegistration7.cxx ) +add_executable(ITKv3DeformableRegistration7 DeformableRegistration7.cxx) target_link_libraries(ITKv3DeformableRegistration7 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3DeformableRegistration8 DeformableRegistration8.cxx ) +add_executable(ITKv3DeformableRegistration8 DeformableRegistration8.cxx) target_link_libraries(ITKv3DeformableRegistration8 "${ITKRegistrationCommon-Test_LIBRARIES}") -if( ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW ) - add_executable(ITKv3DeformableRegistration10 DeformableRegistration10.cxx ) +if(ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) + add_executable(ITKv3DeformableRegistration10 DeformableRegistration10.cxx) target_link_libraries(ITKv3DeformableRegistration10 "${ITKRegistrationCommon-Test_LIBRARIES}") endif() -add_executable(ITKv3MultiResImageRegistration1 MultiResImageRegistration1.cxx ) +add_executable(ITKv3MultiResImageRegistration1 MultiResImageRegistration1.cxx) target_link_libraries(ITKv3MultiResImageRegistration1 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3DeformableRegistration12 DeformableRegistration12.cxx ) +add_executable(ITKv3DeformableRegistration12 DeformableRegistration12.cxx) target_link_libraries(ITKv3DeformableRegistration12 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3ImageRegistration1 ImageRegistration1.cxx ) +add_executable(ITKv3ImageRegistration1 ImageRegistration1.cxx) target_link_libraries(ITKv3ImageRegistration1 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3MeanSquaresImageMetric1 MeanSquaresImageMetric1.cxx ) +add_executable(ITKv3MeanSquaresImageMetric1 MeanSquaresImageMetric1.cxx) target_link_libraries(ITKv3MeanSquaresImageMetric1 "${ITKRegistrationCommon-Test_LIBRARIES}") -add_executable(ITKv3DeformationFieldJacobian DeformationFieldJacobian.cxx ) +add_executable(ITKv3DeformationFieldJacobian DeformationFieldJacobian.cxx) target_link_libraries(ITKv3DeformationFieldJacobian "${ITKRegistrationCommon-Test_LIBRARIES}") if(BUILD_TESTING) diff --git a/Modules/Registration/Common/test/RegistrationITKv3/test/CMakeLists.txt b/Modules/Registration/Common/test/RegistrationITKv3/test/CMakeLists.txt index 08d1d84b103..25bc8c7c665 100644 --- a/Modules/Registration/Common/test/RegistrationITKv3/test/CMakeLists.txt +++ b/Modules/Registration/Common/test/RegistrationITKv3/test/CMakeLists.txt @@ -289,11 +289,11 @@ itk_add_test(NAME ITKv3DeformableRegistration12Test4 COMMAND ${ITK_TEST_DRIVER} ${TEMP}/DeformableRegistration12Test4FinalTransformParameters.txt ) -if( ITK_USE_BRAINWEB_DATA ) +if(ITK_USE_BRAINWEB_DATA) - set( NUMBER_OF_BSPLINE_GRID_NODES 5 ) + set(NUMBER_OF_BSPLINE_GRID_NODES 5) - if( CTEST_TEST_TIMEOUT GREATER 3000 ) + if(CTEST_TEST_TIMEOUT GREATER 3000) itk_add_test(NAME ITKv3DeformableRegistration8Test1 COMMAND ${ITK_TEST_DRIVER} --compare DATA{${ITK_EXAMPLE_DATA_ROOT}/BrainWeb/brainweb1e1a10f20.mha} @@ -377,7 +377,7 @@ if( ITK_USE_BRAINWEB_DATA ) endif() # CTEST_TEST_TIMEOUT GREATER 3000 - if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 6 ) + if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 6) set(NUMBER_OF_BSPLINE_GRID_NODES 32) itk_add_test(NAME ITKv3DeformableRegistration8Test5 COMMAND ${ITK_TEST_DRIVER} @@ -485,7 +485,7 @@ if( ITK_USE_BRAINWEB_DATA ) RESOURCE_LOCK MEMORY_SIZE ) - if( "${ITK_COMPUTER_MEMORY_SIZE}" GREATER 16 ) + if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 16) itk_add_test(NAME ITKv3DeformableRegistration8Test11 COMMAND ${ITK_TEST_DRIVER} $ diff --git a/Modules/Registration/FEM/test/CMakeLists.txt b/Modules/Registration/FEM/test/CMakeLists.txt index c4a666f800d..11f39f22ef8 100644 --- a/Modules/Registration/FEM/test/CMakeLists.txt +++ b/Modules/Registration/FEM/test/CMakeLists.txt @@ -9,7 +9,7 @@ itkPhysicsBasedNonRigidRegistrationMethodTest.cxx ) # For itkPhysicsBasedNonRigidRegistrationMethodTest.cxx -include_directories( ${ITKFEMRegistration_SOURCE_DIR}/test ) +include_directories(${ITKFEMRegistration_SOURCE_DIR}/test) CreateTestDriver(ITKFEMRegistration "${ITKFEMRegistration-Test_LIBRARIES}" "${ITKFEMRegistrationTests}") diff --git a/Modules/Registration/Metricsv4/test/CMakeLists.txt b/Modules/Registration/Metricsv4/test/CMakeLists.txt index 8986f623e2c..827dce20b2e 100644 --- a/Modules/Registration/Metricsv4/test/CMakeLists.txt +++ b/Modules/Registration/Metricsv4/test/CMakeLists.txt @@ -77,7 +77,7 @@ itk_add_test(NAME itkJointHistogramMutualInformationImageToImageRegistrationTest ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBorder20.png ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBSplined10.png ${TEMP}/itkJointHistogramMutualInformationImageToImageRegistrationTest.nii.gz - 2 1 ) + 2 1) itk_add_test(NAME itkJointHistogramMutualInformationImageToImageRegistrationTest2 COMMAND ITKMetricsv4TestDriver @@ -85,7 +85,7 @@ itk_add_test(NAME itkJointHistogramMutualInformationImageToImageRegistrationTest DATA{Baseline/face_avg.jpg} DATA{Input/face_b.jpg} ${TEMP}/itkJointHistogramMutualInformationImageToImageRegistrationTest2.nii.gz - 2 1 ) + 2 1) itk_add_test(NAME itkMeanSquaresImageToImageMetricv4Test COMMAND ITKMetricsv4TestDriver @@ -113,7 +113,7 @@ itk_add_test(NAME itkANTSNeighborhoodCorrelationImageToImageRegistrationTest ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBorder20.png ${ITK_EXAMPLE_DATA_ROOT}/BrainProtonDensitySliceBSplined10.png ${TEMP}/itkANTSNeighborhoodCorrelationImageToImageRegistrationTest.nii.gz - 1 1 0.25 ) + 1 1 0.25) itk_add_test(NAME itkMattesMutualInformationImageToImageMetricv4Test COMMAND ITKMetricsv4TestDriver @@ -125,7 +125,7 @@ itk_add_test(NAME itkMattesMutualInformationImageToImageMetricv4RegistrationTest DATA{Baseline/face_avg.jpg} DATA{Input/face_b.jpg} ${TEMP}/itkMattesMutualInformationImageToImageMetricv4RegistrationTest.nii.gz - 5 0 ) + 5 0) itk_add_test(NAME itkMultiStartImageToImageMetricv4RegistrationTest COMMAND ITKMetricsv4TestDriver @@ -133,7 +133,7 @@ itk_add_test(NAME itkMultiStartImageToImageMetricv4RegistrationTest DATA{Baseline/face_avg.jpg} DATA{Input/face_b.jpg} ${TEMP}/itkMultiStartImageToImageMetricv4RegistrationTest.nii.gz - 5 1 ) + 5 1) itk_add_test(NAME itkMultiGradientImageToImageMetricv4RegistrationTest COMMAND ITKMetricsv4TestDriver @@ -153,7 +153,7 @@ itk_add_test(NAME itkMeanSquaresImageToImageMetricv4RegistrationTest DATA{Baseline/face_avg.jpg} DATA{Input/face_b.jpg} ${TEMP}/itkMeanSquaresImageToImageMetricv4RegistrationTest.nii.gz - 2 1 ) + 2 1) itk_add_test(NAME itkMeanSquaresImageToImageMetricv4RegistrationTest2 COMMAND ITKMetricsv4TestDriver @@ -256,7 +256,7 @@ itk_add_test(NAME itkObjectToObjectMultiMetricv4Test itk_add_test(NAME itkObjectToObjectMultiMetricv4RegistrationTest COMMAND ITKMetricsv4TestDriver - itkObjectToObjectMultiMetricv4RegistrationTest ) + itkObjectToObjectMultiMetricv4RegistrationTest) itk_add_test(NAME itkMeanSquaresImageToImageMetricv4VectorRegistrationTest COMMAND ITKMetricsv4TestDriver @@ -267,4 +267,4 @@ itk_add_test(NAME itkMeanSquaresImageToImageMetricv4VectorRegistrationTest DATA{Input/orange.jpg} DATA{Input/apple.jpg} ${TEMP}/itkMeanSquaresImageToImageMetricv4VectorRegistrationTest.nii.gz - 100 25 ) + 100 25) diff --git a/Modules/Registration/PDEDeformable/itk-module.cmake b/Modules/Registration/PDEDeformable/itk-module.cmake index ec1215ce969..d24743cc1b1 100644 --- a/Modules/Registration/PDEDeformable/itk-module.cmake +++ b/Modules/Registration/PDEDeformable/itk-module.cmake @@ -3,8 +3,8 @@ registration based on intensity differences by solving the PDE, optical flow problem. This includes Thirion's popular \"demons\" algorithm.") -set(_FFTW_DEPENDS ) -if( ITK_USE_FFTWF OR ITK_USE_FFTWD ) +set(_FFTW_DEPENDS) +if(ITK_USE_FFTWF OR ITK_USE_FFTWD) set(_FFTW_DEPENDS "ITKFFT") endif() diff --git a/Modules/Registration/RegistrationMethodsv4/test/CMakeLists.txt b/Modules/Registration/RegistrationMethodsv4/test/CMakeLists.txt index 7b2c2877f1a..bdabb03fc45 100644 --- a/Modules/Registration/RegistrationMethodsv4/test/CMakeLists.txt +++ b/Modules/Registration/RegistrationMethodsv4/test/CMakeLists.txt @@ -255,7 +255,7 @@ itk_add_test(NAME itkQuasiNewtonOptimizerv4RegistrationTest1 DATA{Input/r16slice_rigid.nii.gz} DATA{Input/r64slice.nii.gz} ${TEMP}/itkQuasiNewtonOptimizerv4RegistrationTest1.nii.gz - 5 2 ) + 5 2) itk_add_test(NAME itkQuasiNewtonOptimizerv4RegistrationTest2 COMMAND ITKRegistrationMethodsv4TestDriver @@ -265,7 +265,7 @@ itk_add_test(NAME itkQuasiNewtonOptimizerv4RegistrationTest2 DATA{Input/r16slice_rigid.nii.gz} DATA{Input/r64slice.nii.gz} ${TEMP}/itkQuasiNewtonOptimizerv4RegistrationTest2.nii.gz - 5 2 ) + 5 2) itk_add_test(NAME itkQuasiNewtonOptimizerv4RegistrationTest3 COMMAND ITKRegistrationMethodsv4TestDriver @@ -275,7 +275,7 @@ itk_add_test(NAME itkQuasiNewtonOptimizerv4RegistrationTest3 DATA{Input/r16slice_rigid.nii.gz} DATA{Input/r64slice.nii.gz} ${TEMP}/itkQuasiNewtonOptimizerv4RegistrationTest3.nii.gz - 5 2 ) + 5 2) itk_add_test(NAME itkBSplineImageRegistrationTest COMMAND ITKRegistrationMethodsv4TestDriver @@ -294,4 +294,4 @@ itk_add_test(NAME itkBSplineImageRegistrationTest ) set_property(TEST itkBSplineImageRegistrationTest APPEND PROPERTY LABELS RUNS_LONG) set_property(TEST itkBSplineImageRegistrationTest APPEND PROPERTY RUN_SERIAL True) -set_tests_properties( itkBSplineImageRegistrationTest PROPERTIES COST 30 ) +set_tests_properties(itkBSplineImageRegistrationTest PROPERTIES COST 30) diff --git a/Modules/Segmentation/LabelVoting/test/CMakeLists.txt b/Modules/Segmentation/LabelVoting/test/CMakeLists.txt index d0e670f971c..2fad128c9e4 100644 --- a/Modules/Segmentation/LabelVoting/test/CMakeLists.txt +++ b/Modules/Segmentation/LabelVoting/test/CMakeLists.txt @@ -13,11 +13,11 @@ CreateTestDriver(ITKLabelVoting "${ITKLabelVoting-Test_LIBRARIES}" "${ITKLabelV itk_add_test(NAME itkVotingBinaryImageFilterTest0 COMMAND ITKLabelVotingTestDriver --compare-MD5 ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryImageFilterTest0.mha "5a20f8e1f4f15d3c6059842550d67d2f" - itkVotingBinaryImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1-bin.png} ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryImageFilterTest0.mha 5 255 0 ) + itkVotingBinaryImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1-bin.png} ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryImageFilterTest0.mha 5 255 0) itk_add_test(NAME itkVotingBinaryImageFilterTest1 COMMAND ITKLabelVotingTestDriver --compare-MD5 ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryImageFilterTest1.mha "5afdcc3ca5e4c6295a15391ca7cbfec0" - itkVotingBinaryImageFilterTest DATA{${ITK_DATA_ROOT}/Input/2th_cthead1.png} ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryImageFilterTest1.mha 5 100 0 ) + itkVotingBinaryImageFilterTest DATA{${ITK_DATA_ROOT}/Input/2th_cthead1.png} ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryImageFilterTest1.mha 5 100 0) itk_add_test(NAME itkLabelVotingImageFilterTest COMMAND ITKLabelVotingTestDriver itkLabelVotingImageFilterTest) itk_add_test(NAME itkVotingBinaryIterativeHoleFillingImageFilterTest @@ -29,5 +29,5 @@ itk_add_test(NAME itkVotingBinaryHoleFillingImageFilterTest --compare-MD5 ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryHoleFillingImageFilterTest.png fd3bd75fc6270e3c416a3f0807a6e24b itkVotingBinaryHoleFillingImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/itkVotingBinaryHoleFillingImageFilterTest.png) -itk_add_test( NAME itkMultiLabelSTAPLEImageFilterTest - COMMAND ITKLabelVotingTestDriver itkMultiLabelSTAPLEImageFilterTest ) +itk_add_test(NAME itkMultiLabelSTAPLEImageFilterTest + COMMAND ITKLabelVotingTestDriver itkMultiLabelSTAPLEImageFilterTest) diff --git a/Modules/Segmentation/LevelSetsv4/itk-module.cmake b/Modules/Segmentation/LevelSetsv4/itk-module.cmake index 71c8c95d1e0..e1e02ae39ba 100644 --- a/Modules/Segmentation/LevelSetsv4/itk-module.cmake +++ b/Modules/Segmentation/LevelSetsv4/itk-module.cmake @@ -6,7 +6,7 @@ to a partial differential equation based on image-based features and characteris of the level-set function. The segmentation evolves from an initial value for the segmenting contour.") -if( LevelSetsv4_VIZ ) +if(LevelSetsv4_VIZ) itk_module(ITKLevelSetsv4 DEPENDS ITKCommon diff --git a/Modules/Segmentation/LevelSetsv4/test/CMakeLists.txt b/Modules/Segmentation/LevelSetsv4/test/CMakeLists.txt index 6704729a444..19b2d96b41a 100644 --- a/Modules/Segmentation/LevelSetsv4/test/CMakeLists.txt +++ b/Modules/Segmentation/LevelSetsv4/test/CMakeLists.txt @@ -178,15 +178,15 @@ itk_add_test(NAME itkSingleLevelSetsv4WhitakerImage2DWithPropagationTest itk_add_test(NAME itkLevelSetsv4EquationCurvatureTermTest COMMAND ITKLevelSetsv4TestDriver itkLevelSetEquationCurvatureTermTest - DATA{${ITK_DATA_ROOT}/Input/whiteSpot.png} ) + DATA{${ITK_DATA_ROOT}/Input/whiteSpot.png}) itk_add_test(NAME itkLevelSetsv4EquationPropagationTermTest COMMAND ITKLevelSetsv4TestDriver itkLevelSetEquationPropagationTermTest - DATA{${ITK_DATA_ROOT}/Input/whiteSpot.png} ) + DATA{${ITK_DATA_ROOT}/Input/whiteSpot.png}) itk_add_test(NAME itkLevelSetsv4EquationLaplacianTermTest COMMAND ITKLevelSetsv4TestDriver itkLevelSetEquationLaplacianTermTest - DATA{${ITK_DATA_ROOT}/Input/whiteSpot.png} ) + DATA{${ITK_DATA_ROOT}/Input/whiteSpot.png}) # two level sets itk_add_test(NAME itkTwoLevelSetsv4DenseImage2DTest diff --git a/Modules/Segmentation/SuperPixel/test/CMakeLists.txt b/Modules/Segmentation/SuperPixel/test/CMakeLists.txt index dbd6ccf6ea6..b608785f91a 100644 --- a/Modules/Segmentation/SuperPixel/test/CMakeLists.txt +++ b/Modules/Segmentation/SuperPixel/test/CMakeLists.txt @@ -15,7 +15,7 @@ itk_add_test(NAME itkSLICImageFilterTest1 "${ITK_TEST_OUTPUT_DIR}/itkSLICImageFilterTestOutput1.png" itkSLICImageFilterTest "DATA{Data/Input/VM1111Shrink-RGB.png}" - "${ITK_TEST_OUTPUT_DIR}/itkSLICImageFilterTestOutput1.png" 25 0 ) + "${ITK_TEST_OUTPUT_DIR}/itkSLICImageFilterTestOutput1.png" 25 0) itk_add_test(NAME itkSLICImageFilterTest2 @@ -24,7 +24,7 @@ itk_add_test(NAME itkSLICImageFilterTest2 "${ITK_TEST_OUTPUT_DIR}/itkSLICImageFilterTestOutput2.png" itkSLICImageFilterTest "DATA{Data/Input/VM1111Shrink-LAB.mha}" - "${ITK_TEST_OUTPUT_DIR}/itkSLICImageFilterTestOutput2.png" 25 0 ) + "${ITK_TEST_OUTPUT_DIR}/itkSLICImageFilterTestOutput2.png" 25 0) diff --git a/Modules/Video/BridgeVXL/itk-module-init.cmake b/Modules/Video/BridgeVXL/itk-module-init.cmake index 048eb3c3bd2..6175777d69d 100644 --- a/Modules/Video/BridgeVXL/itk-module-init.cmake +++ b/Modules/Video/BridgeVXL/itk-module-init.cmake @@ -2,7 +2,7 @@ if(ITK_USE_SYSTEM_VXL) find_package(VXL 2.0.2 REQUIRED) if (VXL_FOUND) - include( ${VXL_CMAKE_DIR}/UseVXL.cmake ) + include(${VXL_CMAKE_DIR}/UseVXL.cmake) message("ITK_USE_SYSTEM_VXL is ON; Use an outside build of VXL. ") endif() endif() diff --git a/Modules/Video/BridgeVXL/test/CMakeLists.txt b/Modules/Video/BridgeVXL/test/CMakeLists.txt index b229427063a..c8c6b864ba6 100644 --- a/Modules/Video/BridgeVXL/test/CMakeLists.txt +++ b/Modules/Video/BridgeVXL/test/CMakeLists.txt @@ -6,11 +6,11 @@ vidl_itk_istreamTest.cxx ) if(ITK_USE_SYSTEM_VXL) - include( ${VXL_CMAKE_DIR}/UseVXL.cmake ) + include(${VXL_CMAKE_DIR}/UseVXL.cmake) endif() CreateTestDriver(ITKVideoBridgeVXL "${ITKVideoBridgeVXL-Test_LIBRARIES};vul;vidl" - "${ITKVideoBridgeVXLTests}" ) + "${ITKVideoBridgeVXLTests}") #Disable this test for now ( to avoid polluting the dashboard) diff --git a/Modules/Video/Core/test/CMakeLists.txt b/Modules/Video/Core/test/CMakeLists.txt index 68b84f645bc..50b5e00a6af 100644 --- a/Modules/Video/Core/test/CMakeLists.txt +++ b/Modules/Video/Core/test/CMakeLists.txt @@ -11,19 +11,19 @@ set(ITKVideoCoreTests itkVideoToVideoFilterTest.cxx ) -CreateTestDriver(ITKVideoCore "${ITKVideoCore-Test_LIBRARIES}" "${ITKVideoCoreTests}" ) +CreateTestDriver(ITKVideoCore "${ITKVideoCore-Test_LIBRARIES}" "${ITKVideoCoreTests}") # VideoToVideoFilterTest itk_add_test( NAME VideoToVideoFilterTest COMMAND ITKVideoCoreTestDriver - itkVideoToVideoFilterTest ) + itkVideoToVideoFilterTest) # VideoSourceTest itk_add_test( NAME VideoSourceTest COMMAND ITKVideoCoreTestDriver - itkVideoSourceTest ) + itkVideoSourceTest) # VideoStreamTest # This is failing for unknown reasons on some platforms. Disabling for now @@ -32,32 +32,32 @@ if(0) itk_add_test( NAME VideoStreamTest COMMAND ITKVideoCoreTestDriver - itkVideoStreamTest ) + itkVideoStreamTest) endif() # TemporalProcessObjectTest itk_add_test( NAME TemporalProcessObjectTest COMMAND ITKVideoCoreTestDriver - itkTemporalProcessObjectTest ) + itkTemporalProcessObjectTest) # RingBufferTest itk_add_test( NAME RingBufferTest COMMAND ITKVideoCoreTestDriver - itkRingBufferTest ) + itkRingBufferTest) # Testing Temporal Regions itk_add_test( NAME TemporalRegionTest COMMAND ITKVideoCoreTestDriver - itkTemporalRegionTest ) + itkTemporalRegionTest) # Testing Temporal Data Object itk_add_test( NAME TemporalDataObjectTest COMMAND ITKVideoCoreTestDriver - itkTemporalDataObjectTest ) + itkTemporalDataObjectTest) itk_add_test( NAME ImageToVideoFilterTest diff --git a/Utilities/ClangFormat/DownloadClangFormat.cmake b/Utilities/ClangFormat/DownloadClangFormat.cmake index 84c3d577aba..1e46fcdafbe 100644 --- a/Utilities/ClangFormat/DownloadClangFormat.cmake +++ b/Utilities/ClangFormat/DownloadClangFormat.cmake @@ -7,8 +7,8 @@ set(CLANG_FORMAT_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ClangFormat-prefix/src/C configure_file("${ITK_CMAKE_DIR}/ITKClangFormatConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ITKClangFormatConfig.cmake" @ONLY) -set(_clang_format_hash ) -set(_clang_format_url ) +set(_clang_format_hash) +set(_clang_format_url) if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") set(_clang_format_hash b14de32036c48f6c62998e2ebab509e71a0ae71464acb4616484e3a6eb941e1d9fac38559f5d27ea0cbbb512d590279ffb3015fae17779229e1090c2763ebcf3) diff --git a/Utilities/Doxygen/CMakeLists.txt b/Utilities/Doxygen/CMakeLists.txt index 4b022325199..9355c40cfa8 100644 --- a/Utilities/Doxygen/CMakeLists.txt +++ b/Utilities/Doxygen/CMakeLists.txt @@ -14,48 +14,48 @@ endif() # # Generate Doxygen configuration file in all configuration file # -if( ${DOXYGEN_DOT_FOUND} ) - set( ITK_HAVE_DOT "YES" ) +if(${DOXYGEN_DOT_FOUND}) + set(ITK_HAVE_DOT "YES") else() - set( ITK_HAVE_DOT "NO" ) + set(ITK_HAVE_DOT "NO") endif() -set( DOX_MODULE_LIST ${ITK_MODULES_ENABLED} ) +set(DOX_MODULE_LIST ${ITK_MODULES_ENABLED}) foreach(itk-module ${DOX_MODULE_LIST}) if(${itk-module}_IS_TEST) - list( APPEND DOXYGEN_TEST_DIRS "${${itk-module}_SOURCE_DIR}") + list(APPEND DOXYGEN_TEST_DIRS "${${itk-module}_SOURCE_DIR}") else() - if( EXISTS ${${itk-module}_SOURCE_DIR}/include ) - list( APPEND DOXYGEN_INCLUDE_DIRS "${${itk-module}_SOURCE_DIR}/include") + if(EXISTS ${${itk-module}_SOURCE_DIR}/include) + list(APPEND DOXYGEN_INCLUDE_DIRS "${${itk-module}_SOURCE_DIR}/include") endif() endif() endforeach() -list( APPEND DOXYGEN_TEST_DIRS "${ITK_SOURCE_DIR}/Examples") -list( APPEND DOXYGEN_TEST_DIRS "${ITK_SOURCE_DIR}") -list( APPEND DOXYGEN_TEST_DIRS "${ITK_SOURCE_DIR}/Modules/Remote") +list(APPEND DOXYGEN_TEST_DIRS "${ITK_SOURCE_DIR}/Examples") +list(APPEND DOXYGEN_TEST_DIRS "${ITK_SOURCE_DIR}") +list(APPEND DOXYGEN_TEST_DIRS "${ITK_SOURCE_DIR}/Modules/Remote") # # Configure the script and the doxyfile, then add target # -set( ITK_DOXYGEN_OUTPUT_DIR ${ITK_BINARY_DIR}/Utilities/Doxygen ) +set(ITK_DOXYGEN_OUTPUT_DIR ${ITK_BINARY_DIR}/Utilities/Doxygen) -set( ITK_DOXYGEN_DIAGRAMS YES ) +set(ITK_DOXYGEN_DIAGRAMS YES) -cmake_dependent_option( ITK_DOXYGEN_HTML "Doxygen will generate HTML Output" ON "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_DOCSET "Doxygen will generate additional index files for Xcode 3" OFF "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_CHM "Doxygen will generate Microsoft HTML help" OFF "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_QHP "Doxygen will generate Qt Compressed Help" OFF "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_ECLIPSEHELP "Doxygen will generate Eclipse help plugin" OFF "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_LATEX "Doxygen will generate LaTeX output" OFF "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_RTF "Doxygen will generate RTF output optimized for Word 97" OFF "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_XML "Doxygen will generate XML output" OFF "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_HTML "Doxygen will generate HTML Output" ON "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_DOCSET "Doxygen will generate additional index files for Xcode 3" OFF "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_CHM "Doxygen will generate Microsoft HTML help" OFF "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_QHP "Doxygen will generate Qt Compressed Help" OFF "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_ECLIPSEHELP "Doxygen will generate Eclipse help plugin" OFF "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_LATEX "Doxygen will generate LaTeX output" OFF "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_RTF "Doxygen will generate RTF output optimized for Word 97" OFF "ITK_BUILD_DOCUMENTATION" OFF) +cmake_dependent_option(ITK_DOXYGEN_XML "Doxygen will generate XML output" OFF "ITK_BUILD_DOCUMENTATION" OFF) -cmake_dependent_option( ITK_DOXYGEN_SERVER_BASED_SEARCH "Doxygen HTML will use PHP server based search." ON ITK_DOXYGEN_HTML OFF) +cmake_dependent_option(ITK_DOXYGEN_SERVER_BASED_SEARCH "Doxygen HTML will use PHP server based search." ON ITK_DOXYGEN_HTML OFF) -mark_as_advanced( ITK_DOXYGEN_HTML +mark_as_advanced(ITK_DOXYGEN_HTML ITK_DOXYGEN_DOCSET ITK_DOXYGEN_CHM ITK_DOXYGEN_QHP @@ -66,16 +66,16 @@ mark_as_advanced( ITK_DOXYGEN_HTML ITK_DOXYGEN_SERVER_BASED_SEARCH ) -find_package( Perl ) +find_package(Perl) -if( PERL_FOUND ) - set( ITK_DOXYGEN_INPUT_FILTER - "${PERL_EXECUTABLE} ${ITK_BINARY_DIR}/Utilities/Doxygen/itkdoxygen.pl" ) +if(PERL_FOUND) + set(ITK_DOXYGEN_INPUT_FILTER + "${PERL_EXECUTABLE} ${ITK_BINARY_DIR}/Utilities/Doxygen/itkdoxygen.pl") configure_file(${ITK_SOURCE_DIR}/Utilities/Doxygen/itkdoxygen.pl.in ${ITK_BINARY_DIR}/Utilities/Doxygen/itkdoxygen.pl) else() - set( ITK_DOXYGEN_INPUT_FILTER ) + set(ITK_DOXYGEN_INPUT_FILTER) endif() # ------------------------------------------------------------- @@ -108,10 +108,10 @@ if (ITK_BUILD_DOCUMENTATION) configure_file(${CMAKE_CURRENT_LIST_DIR}/build_text.js.in "${ITK_BINARY_DIR}/Utilities/Doxygen//html/build_text.js") - find_package( LATEX ) + find_package(LATEX) # Custom command to generate a examples page which include all ITK examples - add_custom_command( OUTPUT "${ITK_BINARY_DIR}/Documentation/Doxygen/Examples.dox" + add_custom_command(OUTPUT "${ITK_BINARY_DIR}/Documentation/Doxygen/Examples.dox" COMMAND ${CMAKE_COMMAND} -D "PROJECT_SOURCE_DIR:PATH=${ITK_SOURCE_DIR}" -D "OUTPUT_FILE:PATH=${ITK_BINARY_DIR}/Documentation/Doxygen/Examples.dox" -P "${ITK_SOURCE_DIR}/Utilities/Doxygen/GenerateExamplesDox.cmake" @@ -119,7 +119,7 @@ if (ITK_BUILD_DOCUMENTATION) DEPENDS "${ITK_SOURCE_DIR}/Examples" "${ITK_SOURCE_DIR}/Utilities/Doxygen/GenerateExamplesDox.cmake" ) - set( ITK_DOXYGEN_INPUT ${DOXYGEN_INCLUDE_DIRS} + set(ITK_DOXYGEN_INPUT ${DOXYGEN_INCLUDE_DIRS} ${ITK_SOURCE_DIR}/Documentation/Doxygen ${ITK_BINARY_DIR}/Documentation/Doxygen ${ITK_BINARY_DIR}/Documentation/Doxygen/Examples.dox @@ -158,7 +158,7 @@ if (ITK_BUILD_DOCUMENTATION) ${ITK_DOXYGEN_OUTPUT_DIR}/html # output doxygen directory ) - message( STATUS + message(STATUS "To generate Doxygen's documentation, you need to build the Documentation target" ) diff --git a/Utilities/Doxygen/DoxygenConfig.cmake b/Utilities/Doxygen/DoxygenConfig.cmake index 56f9af94f24..a4650c30dba 100644 --- a/Utilities/Doxygen/DoxygenConfig.cmake +++ b/Utilities/Doxygen/DoxygenConfig.cmake @@ -131,11 +131,11 @@ set(DOXYGEN_PREDEFINED "itkNotUsed(x)=" "itkFactorylessNewMacro(x)= static Pointer New(); virtual ::itk::LightObject::Pointer CreateAnother() const;" "itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;" "itkEventMacro(thisClass,superclass)= class thisClass : public superclass {};" - "itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp( const char *file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } newexcp( const std::string & file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } itkTypeMacro( newexcp, , parentexcp); }; }" + "itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp(const char *file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } newexcp(const std::string & file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } itkTypeMacro(newexcp, , parentexcp); }; }" "itkConceptMacro(thisName,thisConcept)= /* This class requires thisName in the form of thisConcept */" "std::numeric_limits= std::numeric_limits" "ITK_TYPENAME= typename" - "itkTemplateFloatingToIntegerMacro(name)= template name( TInput x )" + "itkTemplateFloatingToIntegerMacro(name)= template name(TInput x)" "FEM_ABSTRACT_CLASS(thisClass,parentClass)= public: /** Standard Self typedef.*/ typedef thisClass Self; /** Standard Superclass typedef. */ typedef parentClass Superclass; /** Pointer or SmartPointer to an object. */ typedef Self* Pointer; /** Const pointer or SmartPointer to an object. */ typedef const Self* ConstPointer; private:" "FEM_CLASS(thisClass,parentClass)= FEM_ABSTRACT_CLASS(thisClass,parentClass) public: /** Create a new object from the existing one */ virtual Baseclass::Pointer Clone() const; /** Class ID for FEM object factory */ static const int CLID; /** Virtual function to access the class ID */ virtual int ClassID() const { return CLID; } /** Object creation in an itk compatible way */ static Self::Pointer New() { return new Self(); } private:" "ERROR_CHECKING" diff --git a/Utilities/Doxygen/GenerateExamplesDox.cmake b/Utilities/Doxygen/GenerateExamplesDox.cmake index 49b83b3b8fe..16594ec3ed8 100644 --- a/Utilities/Doxygen/GenerateExamplesDox.cmake +++ b/Utilities/Doxygen/GenerateExamplesDox.cmake @@ -10,44 +10,44 @@ # referenced files. # glob the examples for each language -file( GLOB_RECURSE examples_list_fullpath +file(GLOB_RECURSE examples_list_fullpath FOLLOW_SYMLINKS "${PROJECT_SOURCE_DIR}/Examples/*.cxx" "${PROJECT_SOURCE_DIR}/Examples/*.py" "${PROJECT_SOURCE_DIR}/Examples/*.java" ) -file( GLOB_RECURSE sphinx_examples_list_fullpath +file(GLOB_RECURSE sphinx_examples_list_fullpath "${PROJECT_SOURCE_DIR}/Modules/Remote/SphinxExamples/src/*.cxx" "${PROJECT_SOURCE_DIR}/Modules/Remote/SphinxExamples/src/*.py" ) # Use relative paths -set( examples_list ) -string( LENGTH "${PROJECT_SOURCE_DIR}/" root_length ) -foreach( _example ${examples_list_fullpath} ) - string( SUBSTRING ${_example} ${root_length} -1 example_relative ) - list( APPEND examples_list ${example_relative} ) +set(examples_list) +string(LENGTH "${PROJECT_SOURCE_DIR}/" root_length) +foreach(_example ${examples_list_fullpath}) + string(SUBSTRING ${_example} ${root_length} -1 example_relative) + list(APPEND examples_list ${example_relative}) endforeach() -string( LENGTH "${PROJECT_SOURCE_DIR}/Modules/Remote/" root_length ) -foreach( _example ${sphinx_examples_list_fullpath} ) - string( SUBSTRING ${_example} ${root_length} -1 example_relative ) - list( APPEND examples_list ${example_relative} ) +string(LENGTH "${PROJECT_SOURCE_DIR}/Modules/Remote/" root_length) +foreach(_example ${sphinx_examples_list_fullpath}) + string(SUBSTRING ${_example} ${root_length} -1 example_relative) + list(APPEND examples_list ${example_relative}) endforeach() # remove the file before we begin appending -file( REMOVE ${OUTPUT_FILE} ) +file(REMOVE ${OUTPUT_FILE}) # begin comment -file( APPEND ${OUTPUT_FILE} "/**\n") +file(APPEND ${OUTPUT_FILE} "/**\n") # After updating to Doxygen 1.8.4, this new line is required for any # of the \example to be utilized -file( APPEND ${OUTPUT_FILE} " \n") +file(APPEND ${OUTPUT_FILE} " \n") -foreach( f IN LISTS examples_list ) - file( APPEND ${OUTPUT_FILE} "\\example ${f}\n" ) +foreach(f IN LISTS examples_list) + file(APPEND ${OUTPUT_FILE} "\\example ${f}\n") endforeach() # end comment -file( APPEND ${OUTPUT_FILE} "*/\n" ) +file(APPEND ${OUTPUT_FILE} "*/\n") diff --git a/Utilities/KWStyle/BuildKWStyle.cmake b/Utilities/KWStyle/BuildKWStyle.cmake index 1d9116ba6a7..b2f66be3e48 100644 --- a/Utilities/KWStyle/BuildKWStyle.cmake +++ b/Utilities/KWStyle/BuildKWStyle.cmake @@ -1,8 +1,8 @@ include(ExternalProject) -set( KWStyle_SOURCE_DIR ${CMAKE_BINARY_DIR}/KWStyle ) -set( KWStyle_DIR ${CMAKE_BINARY_DIR}/KWStyle-build ) -set( KWSTYLE_EXECUTABLE ${KWStyle_DIR}/KWStyle) +set(KWStyle_SOURCE_DIR ${CMAKE_BINARY_DIR}/KWStyle) +set(KWStyle_DIR ${CMAKE_BINARY_DIR}/KWStyle-build) +set(KWSTYLE_EXECUTABLE ${KWStyle_DIR}/KWStyle) if(CMAKE_BUILD_TYPE) set(_build_configuration_arg -DCMAKE_BUILD_TYPE=Release) diff --git a/Utilities/KWStyle/KWStyle.cmake b/Utilities/KWStyle/KWStyle.cmake index 73e01d8d1cc..281e0b97fa7 100644 --- a/Utilities/KWStyle/KWStyle.cmake +++ b/Utilities/KWStyle/KWStyle.cmake @@ -6,7 +6,7 @@ if(ITK_USE_KWSTYLE) set(kwstyle_itk_examples_files_list_file ${ITK_BINARY_DIR}/Utilities/KWStyle/ITKExamplesFiles.txt ) - configure_file( # KWStyle requires that the files list be absolute paths + configure_file(# KWStyle requires that the files list be absolute paths ${ITK_SOURCE_DIR}/Utilities/KWStyle/ITKExamplesFiles.txt.in ${kwstyle_itk_examples_files_list_file} ) diff --git a/Wrapping/ConfigureWrapping.cmake b/Wrapping/ConfigureWrapping.cmake index 443d7e12153..fb7ea75d32b 100644 --- a/Wrapping/ConfigureWrapping.cmake +++ b/Wrapping/ConfigureWrapping.cmake @@ -63,7 +63,7 @@ if(${CMAKE_MAKE_PROGRAM} MATCHES make) set(ITK_WRAP_NEEDS_DEPEND 0) endif() -set(CSWIG_EXTRA_LINKFLAGS ) +set(CSWIG_EXTRA_LINKFLAGS) if(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)") set(CSWIG_EXTRA_LINKFLAGS "/IGNORE:4049 /IGNORE:4109") endif() diff --git a/Wrapping/DoxygenConfig.cmake b/Wrapping/DoxygenConfig.cmake index e50873fa877..c372b7920db 100644 --- a/Wrapping/DoxygenConfig.cmake +++ b/Wrapping/DoxygenConfig.cmake @@ -127,11 +127,11 @@ set(DOXYGEN_PREDEFINED "itkNotUsed(x)=" "itkFactorylessNewMacro(x)= static Pointer New(); virtual ::itk::LightObject::Pointer CreateAnother() const;" "itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;" "itkEventMacro(thisClass,superclass)= class thisClass : public superclass {};" - "itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp( const char *file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } newexcp( const std::string & file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } itkTypeMacro( newexcp, , parentexcp); }; }" + "itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp(const char *file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } newexcp(const std::string & file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } itkTypeMacro(newexcp, , parentexcp); }; }" "itkConceptMacro(thisName,thisConcept)= /* This class requires thisName in the form of thisConcept */" "std::numeric_limits= std::numeric_limits" "ITK_TYPENAME= typename" - "itkTemplateFloatingToIntegerMacro(name)= template name( TInput x )" + "itkTemplateFloatingToIntegerMacro(name)= template name(TInput x)" "FEM_ABSTRACT_CLASS(thisClass,parentClass)= public: /** Standard Self typedef.*/ typedef thisClass Self; /** Standard Superclass typedef. */ typedef parentClass Superclass; /** Pointer or SmartPointer to an object. */ typedef Self* Pointer; /** Const pointer or SmartPointer to an object. */ typedef const Self* ConstPointer; private:" "FEM_CLASS(thisClass,parentClass)= FEM_ABSTRACT_CLASS(thisClass,parentClass) public: /** Create a new object from the existing one */ virtual Baseclass::Pointer Clone() const; /** Class ID for FEM object factory */ static const int CLID; /** Virtual function to access the class ID */ virtual int ClassID() const { return CLID; } /** Object creation in an itk compatible way */ static Self::Pointer New() { return new Self(); } private:" "ERROR_CHECKING" diff --git a/Wrapping/Generators/CastXML/CMakeLists.txt b/Wrapping/Generators/CastXML/CMakeLists.txt index d4b37f795d7..2a8db7d72f6 100644 --- a/Wrapping/Generators/CastXML/CMakeLists.txt +++ b/Wrapping/Generators/CastXML/CMakeLists.txt @@ -19,8 +19,8 @@ else() include(ExternalProject) set(_download_castxml_binaries 0) - set(_castxml_url ) - set(_castxml_hash ) + set(_castxml_url) + set(_castxml_hash) # If 64 bit Linux build host, use the CastXML binary if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") diff --git a/Wrapping/Generators/Python/CMakeLists.txt b/Wrapping/Generators/Python/CMakeLists.txt index e1fbbff0724..fca3d999b87 100644 --- a/Wrapping/Generators/Python/CMakeLists.txt +++ b/Wrapping/Generators/Python/CMakeLists.txt @@ -87,27 +87,27 @@ endmacro() if(NOT EXTERNAL_WRAP_ITK_PROJECT) # copy the files to expose build options in python - set(ITK_WRAP_PYTHON_VECTOR_REAL ) + set(ITK_WRAP_PYTHON_VECTOR_REAL) foreach(t ${WRAP_ITK_VECTOR_REAL}) foreach(d ${ITK_WRAP_IMAGE_DIMS}) list(APPEND ITK_WRAP_PYTHON_VECTOR_REAL ${ITKT_${t}${d}}) endforeach() endforeach() - set(ITK_WRAP_PYTHON_COV_VECTOR_REAL ) + set(ITK_WRAP_PYTHON_COV_VECTOR_REAL) foreach(t ${WRAP_ITK_COV_VECTOR_REAL}) foreach(d ${ITK_WRAP_IMAGE_DIMS}) list(APPEND ITK_WRAP_PYTHON_COV_VECTOR_REAL ${ITKT_${t}${d}}) endforeach() endforeach() - set(ITK_WRAP_PYTHON_RGB ) + set(ITK_WRAP_PYTHON_RGB) foreach(t ${WRAP_ITK_RGB}) list(APPEND ITK_WRAP_PYTHON_RGB ${ITKT_${t}}) endforeach() - set(ITK_WRAP_PYTHON_RGBA ) + set(ITK_WRAP_PYTHON_RGBA) foreach(t ${WRAP_ITK_RGBA}) list(APPEND ITK_WRAP_PYTHON_RGBA ${ITKT_${t}}) endforeach() - set(ITK_WRAP_PYTHON_COMPLEX_REAL ) + set(ITK_WRAP_PYTHON_COMPLEX_REAL) foreach(t ${WRAP_ITK_COMPLEX_REAL}) list(APPEND ITK_WRAP_PYTHON_COMPLEX_REAL ${ITKT_${t}}) endforeach() @@ -172,7 +172,7 @@ if(NOT EXTERNAL_WRAP_ITK_PROJECT) endif() # Install the package python files. - set(ITK_WRAP_PYTHON_FILES ) + set(ITK_WRAP_PYTHON_FILES) foreach(_file ${ITK_PYTHON_SUPPORT_MODULES}) set(install_tgt "${CMAKE_CURRENT_SOURCE_DIR}/itk/${_file}.py") list(APPEND ITK_WRAP_PYTHON_FILES ${ITK_WRAP_PYTHON_FILES} "${install_tgt}") @@ -287,7 +287,7 @@ macro(itk_end_wrap_submodule_python group_name) if("${group_name}" STREQUAL "ITKQuadEdgeMeshBase") # add a template definition for the superclass which is not in ITK - set(text ) + set(text) foreach(d ${ITK_WRAP_IMAGE_DIMS}) set(text "${text}%template(mapULitkQuadEdgeMeshPointF${d}) std::map< unsigned long, itkQuadEdgeMeshPointF${d}, std::less< unsigned long > >;\n") ADD_PYTHON_CONFIG_TEMPLATE("map" "std::map" "mapULitkQuadEdgeMeshPointF${d}" "unsigned long, itk::QuadEdgeMeshPoint< float, ${d} >") @@ -354,12 +354,12 @@ macro(itk_end_wrap_submodule_python group_name) set(ITK_WRAP_PYTHON_LIBRARY_DECLS "${ITK_WRAP_PYTHON_LIBRARY_DECLS} extern \"C\" PyMODINIT_FUNC PyInit__${base_name}Python();\n") set(ITK_WRAP_PYTHON_LIBRARY_CALLS "${ITK_WRAP_PYTHON_LIBRARY_CALLS} PyObject * ${base_name}AlreadyImported = PyDict_GetItemString(sysModules, \"itk._${base_name}Python\"); - if( ${base_name}AlreadyImported == NULL ) + if(${base_name}AlreadyImported == NULL) { - PyImport_AddModule( \"itk._${base_name}Python\" ); + PyImport_AddModule(\"itk._${base_name}Python\"); PyObject * ${base_name}Module = PyInit__${base_name}Python(); - PyDict_SetItemString( sysModules, \"itk._${base_name}Python\", ${base_name}Module ); - Py_DECREF( ${base_name}Module ); + PyDict_SetItemString(sysModules, \"itk._${base_name}Python\", ${base_name}Module); + Py_DECREF( ${base_name}Module); } ") diff --git a/Wrapping/Generators/Python/PyBase/CMakeLists.txt b/Wrapping/Generators/Python/PyBase/CMakeLists.txt index b329db92c14..7c412a0ab0f 100644 --- a/Wrapping/Generators/Python/PyBase/CMakeLists.txt +++ b/Wrapping/Generators/Python/PyBase/CMakeLists.txt @@ -1,7 +1,7 @@ itk_wrap_module("ITKPyBase" Python) - set(WRAPPER_LIBRARY_DEPENDS ) - set(WRAPPER_LIBRARY_LINK_LIBRARIES ) + set(WRAPPER_LIBRARY_DEPENDS) + set(WRAPPER_LIBRARY_LINK_LIBRARIES) set(WRAPPER_LIBRARY_SWIG_INPUTS "${CMAKE_CURRENT_SOURCE_DIR}/pyBase.i") diff --git a/Wrapping/Generators/SwigInterface/CMakeLists.txt b/Wrapping/Generators/SwigInterface/CMakeLists.txt index 2278d4f23ff..5d60c8a128a 100644 --- a/Wrapping/Generators/SwigInterface/CMakeLists.txt +++ b/Wrapping/Generators/SwigInterface/CMakeLists.txt @@ -28,9 +28,9 @@ if(WIN32) else() # follow the standard EP_PREFIX locations - set ( swig_binary_dir ${CMAKE_CURRENT_BINARY_DIR}/swig-prefix/src/swig-build ) - set ( swig_source_dir ${CMAKE_CURRENT_BINARY_DIR}/swig-prefix/src/swig ) - set ( swig_install_dir ${CMAKE_CURRENT_BINARY_DIR}/swig ) + set(swig_binary_dir ${CMAKE_CURRENT_BINARY_DIR}/swig-prefix/src/swig-build) + set(swig_source_dir ${CMAKE_CURRENT_BINARY_DIR}/swig-prefix/src/swig) + set(swig_install_dir ${CMAKE_CURRENT_BINARY_DIR}/swig) set(swig_ep "${swig_install_dir}/bin/swig") endif() @@ -151,9 +151,9 @@ else() ) # swig uses bison find it by cmake and pass it down - find_package ( BISON ) - set ( BISON_FLAGS "" CACHE STRING "Flags used by bison" ) - mark_as_advanced ( BISON_FLAGS ) + find_package(BISON) + set(BISON_FLAGS "" CACHE STRING "Flags used by bison") + mark_as_advanced(BISON_FLAGS) # From SWIG configure diff --git a/Wrapping/TypedefMacros.cmake b/Wrapping/TypedefMacros.cmake index 0ee811f4c8c..6620c831590 100644 --- a/Wrapping/TypedefMacros.cmake +++ b/Wrapping/TypedefMacros.cmake @@ -124,45 +124,45 @@ macro(itk_wrap_module library_name) # WRAPPER_SUBMODULE_ORDER. List of *.wrap submodules in the source dir # that should be included/wrapped before the rest in the given order. # Just the submodule group name is needed, not the full path or file name. - unset(WRAPPER_SUBMODULE_ORDER ) + unset(WRAPPER_SUBMODULE_ORDER) # WRAPPER_LIBRARY_SWIG_INPUTS. List of C++ source files to be used # as input for Swig. This list is then appended to by # WRAPPER_LIBRARY_AUTO_INCLUDE_WRAP_FILES. A full path to each input is required. - unset(WRAPPER_LIBRARY_SWIG_INPUTS ) + unset(WRAPPER_LIBRARY_SWIG_INPUTS) # WRAPPER_SWIG_LIBRARY_FILES. List of swig .swg files to pass to cswig to control # type handling and so forth. A full path to each include is required. # The itk.swg file and the library file for the current library are implicitly added. - unset(WRAPPER_SWIG_LIBRARY_FILES ) + unset(WRAPPER_SWIG_LIBRARY_FILES) # WRAPPER_LIBRARY_CXX_SOURCES. C++ sources to be compiled and linked in # to the wrapper library (with no prior processing by swig, etc.) # A full path to each input is required. - unset(WRAPPER_LIBRARY_CXX_SOURCES ) + unset(WRAPPER_LIBRARY_CXX_SOURCES) # Call the language support initialization function # store the content of the mdx file - unset(SWIG_INTERFACE_MDX_CONTENT ) + unset(SWIG_INTERFACE_MDX_CONTENT) # store the content of the .i file for the module - a set of import of all the .i files generated for the module - unset(SWIG_INTERFACE_MODULE_CONTENT ) + unset(SWIG_INTERFACE_MODULE_CONTENT) # build a list of modules to create the igenerator custom command - unset(SWIG_INTERFACE_MODULES ) + unset(SWIG_INTERFACE_MODULES) if(${module_prefix}_WRAP_DOC) - unset(ITK_WRAP_DOC_DOXYGEN_HEADERS ) # doxygen headers to process in this lib - unset(ITK_WRAP_DOC_DOXYGEN_XML_FILES ) # xml files produced by doxygen in this lib - unset(ITK_WRAP_DOC_DOCSTRING_FILES ) # swig docstring files produced by doxygen in this lib + unset(ITK_WRAP_DOC_DOXYGEN_HEADERS) # doxygen headers to process in this lib + unset(ITK_WRAP_DOC_DOXYGEN_XML_FILES) # xml files produced by doxygen in this lib + unset(ITK_WRAP_DOC_DOCSTRING_FILES) # swig docstring files produced by doxygen in this lib endif() - unset(ITK_WRAP_PYTHON_CONFIGURATION_TEMPLATES ) - unset(ITK_WRAP_PYTHON_LIBRARY_IMPORTS ) - unset(ITK_WRAP_PYTHON_LIBRARY_DEPS ) - unset(ITK_WRAP_PYTHON_LIBRARY_DECLS ) + unset(ITK_WRAP_PYTHON_CONFIGURATION_TEMPLATES) + unset(ITK_WRAP_PYTHON_LIBRARY_IMPORTS) + unset(ITK_WRAP_PYTHON_LIBRARY_DEPS) + unset(ITK_WRAP_PYTHON_LIBRARY_DECLS) set(ITK_WRAP_PYTHON_LIBRARY_CALLS "\nPyObject * sysModules = PyImport_GetModuleDict();\n") - unset(ITK_WRAP_PYTHON_CXX_FILES ) - unset(ITK_WRAP_PYTHON_FILES ) + unset(ITK_WRAP_PYTHON_CXX_FILES) + unset(ITK_WRAP_PYTHON_FILES) if(MSVC) get_filename_component(python_library_directory "${Python3_LIBRARIES}" DIRECTORY) # It should use the following code inside `itk_end_wrap_module_python` but @@ -256,7 +256,7 @@ macro(itk_wrap_named_class class swig_name) if("${ARGC}" EQUAL 3) set(WRAPPER_WRAP_METHOD "${ARGV2}") set(VALID_WRAP_METHODS POINTER POINTER_WITH_CONST_POINTER POINTER_WITH_SUPERCLASS POINTER_WITH_2_SUPERCLASSES EXPLICIT_SPECIALIZATION POINTER_WITH_EXPLICIT_SPECIALIZATION ENUM AUTOPOINTER) - if( NOT "${WRAPPER_WRAP_METHOD}" IN_LIST VALID_WRAP_METHODS) + if(NOT "${WRAPPER_WRAP_METHOD}" IN_LIST VALID_WRAP_METHODS) message(SEND_ERROR "itk_wrap_class: Invalid option '${WRAPPER_WRAP_METHOD}'. Possible values are ${VALID_WRAP_METHODS}") endif() unset(VALID_WRAP_METHODS) @@ -284,7 +284,7 @@ macro(itk_wrap_named_class class swig_name) else() set(ITK_WRAP_DOC_GENERATE_DOXY2SWIG_INPUT OFF) get_directory_property(dirs INCLUDE_DIRECTORIES) - set(paths ) + set(paths) foreach(dir ${dirs}) list(APPEND paths "${dir}/${swig_name}.h") endforeach() @@ -355,7 +355,7 @@ macro(itk_wrap_include include_file) list(FIND WRAPPER_INCLUDE_FILES "${include_file}" _index) if (${_index} EQUAL -1) # include order IS important. Default values must be before the other ones - list(APPEND WRAPPER_INCLUDE_FILES ${include_file} ) + list(APPEND WRAPPER_INCLUDE_FILES ${include_file}) endif() endmacro() @@ -792,11 +792,11 @@ macro(itk_wrap_template name types) # set(text "${text} // ======================\n") set(text "${text} ${image_source} * imgsrc;\n") set(text "${text} ${image} * img;\n") - set(text "${text} if( $input != Py_None && SWIG_ConvertPtr($input,(void **)(&imgsrc),\$descriptor(${image_source} *), 0) == 0 )\n") + set(text "${text} if($input != Py_None && SWIG_ConvertPtr($input,(void **)(&imgsrc),\$descriptor(${image_source} *), 0) == 0)\n") set(text "${text} {\n") set(text "${text} \$1 = imgsrc->GetOutput(0);\n") set(text "${text} }\n") - set(text "${text} else if( SWIG_ConvertPtr($input,(void **)(&img),\$descriptor(${image} *), 0) == 0 )\n") + set(text "${text} else if(SWIG_ConvertPtr($input,(void **)(&img),\$descriptor(${image} *), 0) == 0)\n") set(text "${text} {\n") set(text "${text} \$1 = img;\n") set(text "${text} }\n") @@ -812,11 +812,11 @@ macro(itk_wrap_template name types) # set(text "${text} // //////////////////////////\n") set(text "${text} ${image_source} * imgsrc;\n") set(text "${text} ${image} * img;\n") - set(text "${text} if( $input != Py_None && SWIG_ConvertPtr($input,(void **)(&imgsrc),\$descriptor(${image_source} *), 0) == 0 )\n") + set(text "${text} if($input != Py_None && SWIG_ConvertPtr($input,(void **)(&imgsrc),\$descriptor(${image_source} *), 0) == 0)\n") set(text "${text} {\n") set(text "${text} \$1 = 1;\n") set(text "${text} }\n") - set(text "${text} else if( SWIG_ConvertPtr($input,(void **)(&img),\$descriptor(${image} *), 0) == 0 )\n") + set(text "${text} else if(SWIG_ConvertPtr($input,(void **)(&img),\$descriptor(${image} *), 0) == 0)\n") set(text "${text} {\n") set(text "${text} \$1 = 1;\n") set(text "${text} }\n") diff --git a/Wrapping/WrapITKTypes.cmake b/Wrapping/WrapITKTypes.cmake index 5dd49e6ad29..501a11209b7 100644 --- a/Wrapping/WrapITKTypes.cmake +++ b/Wrapping/WrapITKTypes.cmake @@ -221,7 +221,7 @@ WRAP_TYPE("itk::Image" "I" "itkImage.h") UNIQUE(WRAP_ITK_SCALAR_IMAGE_PIXEL_TYPES "${WRAP_ITK_SCALAR};D;UC;SI;UI;UL;ULL;B;${ITKM_IT}") UNIQUE(wrap_image_types "${WRAP_ITK_ALL_TYPES};RGBUC;RGBAUC;VD;${WRAP_ITK_SCALAR_IMAGE_PIXEL_TYPES}") - set(defined_vector_list ) + set(defined_vector_list) foreach(d ${ITK_WRAP_IMAGE_DIMS}) foreach(type ${wrap_image_types}) diff --git a/Wrapping/macro_files/itk_auto_load_submodules.cmake b/Wrapping/macro_files/itk_auto_load_submodules.cmake index 761303a6d3c..9ecc68e5361 100644 --- a/Wrapping/macro_files/itk_auto_load_submodules.cmake +++ b/Wrapping/macro_files/itk_auto_load_submodules.cmake @@ -29,7 +29,7 @@ function(generate_castxml_commandline_flags) # Aggressive optimization flags cause cast_xml to give invalid error conditions set(INVALID_OPTIMIZATION_FLAGS "-fopenmp;-march=[a-zA-Z0-9\-]*;-mtune=[a-zA-Z0-9\-]*;-mfma") - foreach( rmmatch ${INVALID_OPTIMIZATION_FLAGS}) + foreach(rmmatch ${INVALID_OPTIMIZATION_FLAGS}) string(REGEX REPLACE ${rmmatch} "" _castxml_cc_flags "${_castxml_cc_flags}") endforeach() unset(INVALID_OPTIMIZATION_FLAGS) @@ -38,13 +38,13 @@ function(generate_castxml_commandline_flags) separate_arguments(_castxml_cc_flags) unset(_castxml_cc) if(MSVC) - set(_castxml_cc --castxml-cc-msvc ( "${CMAKE_CXX_COMPILER}" ${_castxml_cc_flags} ) -fexceptions) + set(_castxml_cc --castxml-cc-msvc ( "${CMAKE_CXX_COMPILER}" ${_castxml_cc_flags}) -fexceptions) if(MSVC90) # needed for VS2008 64 bit set(_castxml_cc ${_castxml_cc} "-D_HAS_TR1=0") endif() else() - set(_castxml_cc --castxml-cc-gnu ( "${CMAKE_CXX_COMPILER}" ${_castxml_cc_flags} )) + set(_castxml_cc --castxml-cc-gnu ( "${CMAKE_CXX_COMPILER}" ${_castxml_cc_flags})) endif() # Override castxml target platform when cross compiling @@ -123,7 +123,7 @@ function(generate_castxml_commandline_flags) # The wrap_.cxx.in file expands the following variables: # @CASTXML_INCLUDES@, @WRAPPER_MODULE_NAME@, @CASTXML_TYPEDEFS@, @CASTXML_FORCE_INSTANTIATE@ configure_file("${ITK_WRAP_CASTXML_SOURCE_DIR}/wrap_.cxx.in" "${cxx_file}" @ONLY) - unset(CASTXML_INCLUDES ) + unset(CASTXML_INCLUDES) unset(_castxml_depends) # ====== Get list of include files that may trigger needing a re-write of castxml files @@ -269,17 +269,17 @@ macro(itk_auto_load_submodules) # call generator specific logic to set several associated global variables # clear the typedefs and the includes - unset(CASTXML_TYPEDEFS ) - unset(CASTXML_FORCE_INSTANTIATE ) + unset(CASTXML_TYPEDEFS) + unset(CASTXML_FORCE_INSTANTIATE) # typedefs for swig - unset(SWIG_INTERFACE_TYPEDEFS ) + unset(SWIG_INTERFACE_TYPEDEFS) - unset(ITK_WRAP_DOC_DOXY2SWIG_INPUT ) # the c++ name - swig names definitions + unset(ITK_WRAP_DOC_DOXY2SWIG_INPUT) # the c++ name - swig names definitions # WRAPPER_INCLUDE_FILES: contains a list of all files to include in the final cxx file - unset(WRAPPER_INCLUDE_FILES ) + unset(WRAPPER_INCLUDE_FILES) # Add WRAPPER_DEFAULT_INCLUDE to the list of files in WRAPPER_INCLUDE_FILES # to be #included in the final cxx file diff --git a/Wrapping/macro_files/itk_end_wrap_module.cmake b/Wrapping/macro_files/itk_end_wrap_module.cmake index 0fe57b011ed..4cac4594ba0 100644 --- a/Wrapping/macro_files/itk_end_wrap_module.cmake +++ b/Wrapping/macro_files/itk_end_wrap_module.cmake @@ -37,14 +37,14 @@ macro(itk_end_wrap_module) DESTINATION "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}") endforeach() unset(basename) - unset(swig_lib ) + unset(swig_lib) # the list of files generated for the module - unset(i_files ) + unset(i_files) - unset(idx_files ) - unset(typedef_in_files ) - unset(typedef_files ) + unset(idx_files) + unset(typedef_in_files) + unset(typedef_files) set(mdx_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.mdx") set(module_interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i") @@ -65,7 +65,7 @@ macro(itk_end_wrap_module) # ITK_PYI_INDEX_FILES: A list of the index files generated for a specific submodule # Used to generate a complete list of index files generated which should be used as a # dependency in the final pyi_generator step. (duplicate comment from above) - if( _module STREQUAL "stdcomplex" OR _module STREQUAL "stdnumeric_limits") + if(_module STREQUAL "stdcomplex" OR _module STREQUAL "stdnumeric_limits") # Skip classes that require specialized wrapping behavior, see igenerator.py comments # for ["stdcomplex", "stdnumeric_limits"] else() @@ -76,9 +76,9 @@ macro(itk_end_wrap_module) endforeach() # the master idx file (mdx file) - unset(mdx_files ) - unset(mdx_opts ) - unset(deps_imports ) + unset(mdx_files) + unset(mdx_opts) + unset(deps_imports) list(APPEND mdx_files "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.mdx") foreach(dep ${WRAPPER_LIBRARY_DEPENDS}) @@ -95,7 +95,7 @@ macro(itk_end_wrap_module) configure_file("${ITK_WRAP_SWIGINTERFACE_SOURCE_DIR}/Master.mdx.in" "${mdx_file}" @ONLY) unset(CONFIG_INDEX_FILE_CONTENT) - unset(CONFIG_MODULE_INTERFACE_CONTENT ) #"${deps_imports}${SWIG_INTERFACE_MODULE_CONTENT}") + unset(CONFIG_MODULE_INTERFACE_CONTENT) #"${deps_imports}${SWIG_INTERFACE_MODULE_CONTENT}") #@WRAPPER_LIBRARY_NAME@ @CONFIG_MODULE_INTERFACE_INCLUDES@ CONFIG_MODULE_INTERFACE_INCLUDES@ configure_file("${ITK_WRAP_SWIGINTERFACE_SOURCE_DIR}/module.i.in" "${module_interface_file}" @ONLY) @@ -259,14 +259,14 @@ macro(itk_end_wrap_module) unset(ITK_WRAP_PYTHON_LIBRARY_CONFIG_FILE) unset(ITK_WRAP_PYTHON_SNAKE_CASE) - unset(ITK_WRAP_PYTHON_GLOBAL_TIMESTAMP_DECLS ) - unset(ITK_WRAP_PYTHON_GLOBAL_TIMESTAMP_CALLS ) + unset(ITK_WRAP_PYTHON_GLOBAL_TIMESTAMP_DECLS) + unset(ITK_WRAP_PYTHON_GLOBAL_TIMESTAMP_CALLS) if(NOT BUILD_SHARED_LIBS) if(WRAPPER_LIBRARY_NAME STREQUAL "ITKCommon") if(WIN32) set(DO_NOT_WAIT_FOR_THREADS_DECLS "#include \"itkThreadPool.h\"") - set(DO_NOT_WAIT_FOR_THREADS_CALLS "itk::ThreadPool::SetDoNotWaitForThreads( true );") + set(DO_NOT_WAIT_FOR_THREADS_CALLS "itk::ThreadPool::SetDoNotWaitForThreads(true);") endif() set(ITK_WRAP_PYTHON_GLOBAL_TIMESTAMP_DECLS " @@ -295,9 +295,9 @@ _ITKCommonPython_API[_ITKCommonPython_GetGlobalSingletonIndex_NUM] = (void *)_IT PyObject * cAPIObject = PyCapsule_New((void *)_ITKCommonPython_API, \"_ITKCommonPython._C_API\", NULL); -if( cAPIObject != NULL ) +if(cAPIObject != NULL) { -PyModule_AddObject( m, \"_C_API\", cAPIObject ); +PyModule_AddObject(m, \"_C_API\", cAPIObject); } ${DO_NOT_WAIT_FOR_THREADS_CALLS} ") @@ -307,7 +307,7 @@ ${DO_NOT_WAIT_FOR_THREADS_CALLS} ${DO_NOT_WAIT_FOR_THREADS_DECLS} ") set(ITK_WRAP_PYTHON_GLOBAL_TIMESTAMP_CALLS " -if( import__ITKCommonPython() < 0 ) +if(import__ITKCommonPython() < 0) { #if PY_VERSION_HEX >= 0x03000000 return NULL; @@ -315,7 +315,7 @@ return NULL; return; #endif } -itk::SingletonIndex::SetInstance( _ITKCommonPython_GetGlobalSingletonIndex() ); +itk::SingletonIndex::SetInstance(_ITKCommonPython_GetGlobalSingletonIndex()); itk::ObjectFactoryBase::Initialize(); ${DO_NOT_WAIT_FOR_THREADS_CALLS} ") @@ -473,10 +473,10 @@ ${DO_NOT_WAIT_FOR_THREADS_CALLS} ### # These variable are only used inside this function - unset(CASTXML_FORCE_INSTANTIATE ) + unset(CASTXML_FORCE_INSTANTIATE) unset(CastXML_OUTPUT_FILES) unset(CASTXML_TYPEDEFS) - unset(ITK_WRAP_DOC_DOXY2SWIG_INPUT ) # the c++ name - swig names definitions + unset(ITK_WRAP_DOC_DOXY2SWIG_INPUT) # the c++ name - swig names definitions unset(ITK_WRAP_PYTHON_CONFIGURATION_TEMPLATES) unset(ITK_WRAP_PYTHON_CURRENT_CLASS) unset(ITK_WRAP_PYTHON_CURRENT_SWIG_NAME) @@ -489,7 +489,7 @@ ${DO_NOT_WAIT_FOR_THREADS_CALLS} unset(PixelType) unset(SWIG_INTERFACE_MDX_CONTENT) unset(SWIG_INTERFACE_MODULE_CONTENT) - unset(SWIG_INTERFACE_TYPEDEFS ) + unset(SWIG_INTERFACE_TYPEDEFS) unset(WRAPPER_CLASS) unset(WRAPPER_INCLUDE_FILES) endmacro() # itk_end_wrap_module