diff --git a/CMake/Definitions.cmake b/CMake/Definitions.cmake
index 0ccc28c8bd38ac6c8e4f49695f6e1cbc2a9f4c98..c68e27ee7ed6927d496ed524ed9d146dc2e8c884 100644
--- a/CMake/Definitions.cmake
+++ b/CMake/Definitions.cmake
@@ -1,16 +1,16 @@
 
 # ensure WIN32 definition
-IF(WIN32)
-  ADD_DEFINITIONS(-DWIN32)
-ENDIF(WIN32)
+if(WIN32)
+  add_definitions(-DWIN32)
+endif(WIN32)
 
 
 # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
 # warnings
-IF(WIN32)
-    IF(NOT CYGWIN)
-      IF(NOT MINGW)
-          ADD_DEFINITIONS(
+if(WIN32)
+    if(NOT CYGWIN)
+      if(NOT MINGW)
+          add_definitions(
             -D_CRT_FAR_MAPPINGS_NO_DEPRECATE
             -D_CRT_IS_WCTYPE_NO_DEPRECATE
             -D_CRT_MANAGED_FP_NO_DEPRECATE
@@ -23,11 +23,11 @@ IF(WIN32)
             -D_SCL_SECURE_NO_DEPRECATE
             )
 
-        IF (MSVC)
-          ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-          ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNING)
-        ENDIF(MSVC)
+        if(MSVC)
+          add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+          add_definitions(-D_CRT_NONSTDC_NO_WARNING)
+        endif(MSVC)
 
-      ENDIF(NOT MINGW)
-    ENDIF(NOT CYGWIN)
-ENDIF(WIN32)
\ No newline at end of file
+      endif(NOT MINGW)
+    endif(NOT CYGWIN)
+endif(WIN32)
diff --git a/CMake/ParseArguments.cmake b/CMake/ParseArguments.cmake
index da5000e58e2294c1dff5660ef348a839b0a93906..024e64cd9e4a3c99cb3d82c643ab105a32e9d16e 100644
--- a/CMake/ParseArguments.cmake
+++ b/CMake/ParseArguments.cmake
@@ -1,32 +1,32 @@
 # Source : http://www.itk.org/Wiki/CMakeMacroParseArguments
 
-MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
-  SET(DEFAULT_ARGS)
-  FOREACH(arg_name ${arg_names})
-    SET(${prefix}_${arg_name})
-  ENDFOREACH(arg_name)
-  FOREACH(option ${option_names})
-    SET(${prefix}_${option} FALSE)
-  ENDFOREACH(option)
+macro(PARSE_ARGUMENTS prefix arg_names option_names)
+  set(DEFAULT_ARGS)
+  foreach(arg_name ${arg_names})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+  foreach(option ${option_names})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
 
-  SET(current_arg_name DEFAULT_ARGS)
-  SET(current_arg_list)
-  FOREACH(arg ${ARGN})
-    SET(larg_names ${arg_names})
-    LIST(FIND larg_names "${arg}" is_arg_name)
-    IF (is_arg_name GREATER -1)
-      SET(${prefix}_${current_arg_name} ${current_arg_list})
-      SET(current_arg_name ${arg})
-      SET(current_arg_list)
-    ELSE (is_arg_name GREATER -1)
-      SET(loption_names ${option_names})
-      LIST(FIND loption_names "${arg}" is_option)
-      IF (is_option GREATER -1)
-         SET(${prefix}_${arg} TRUE)
-      ELSE (is_option GREATER -1)
-         SET(current_arg_list ${current_arg_list} ${arg})
-      ENDIF (is_option GREATER -1)
-    ENDIF (is_arg_name GREATER -1)
-  ENDFOREACH(arg)
-  SET(${prefix}_${current_arg_name} ${current_arg_list})
-ENDMACRO(PARSE_ARGUMENTS)
\ No newline at end of file
+  set(current_arg_name DEFAULT_ARGS)
+  set(current_arg_list)
+  foreach(arg ${ARGN})
+    set(larg_names ${arg_names})
+    list(FIND larg_names "${arg}" is_arg_name)
+    if(is_arg_name GREATER -1)
+      set(${prefix}_${current_arg_name} ${current_arg_list})
+      set(current_arg_name ${arg})
+      set(current_arg_list)
+    else(is_arg_name GREATER -1)
+      set(loption_names ${option_names})
+      list(FIND loption_names "${arg}" is_option)
+      if(is_option GREATER -1)
+         set(${prefix}_${arg} TRUE)
+      else(is_option GREATER -1)
+         set(current_arg_list ${current_arg_list} ${arg})
+      endif(is_option GREATER -1)
+    endif(is_arg_name GREATER -1)
+  endforeach(arg)
+  set(${prefix}_${current_arg_name} ${current_arg_list})
+endmacro(PARSE_ARGUMENTS)
diff --git a/CMake/UseSWIGLocal.cmake b/CMake/UseSWIGLocal.cmake
index 98bcc995113d1460b64e83624a264987a7ae56a0..9ecb82fbd794e277d129b27ae759ee8ba4cf527b 100644
--- a/CMake/UseSWIGLocal.cmake
+++ b/CMake/UseSWIGLocal.cmake
@@ -10,12 +10,12 @@
 # Set Source files properties such as CPLUSPLUS and SWIG_FLAGS to specify
 # special behavior of SWIG. Also global CMAKE_SWIG_FLAGS can be used to add
 # special flags to all swig calls.
-# Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify 
+# Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify
 # where to write all the swig generated module (swig -outdir option)
 # The name-specific variable SWIG_MODULE_<name>_EXTRA_DEPS may be used
 # to specify extra dependencies for the generated modules.
 # If the source file generated by swig need some special flag you can use
-# SET_SOURCE_FILES_PROPERTIES( ${swig_generated_file_fullname}
+# set_source_files_properties( ${swig_generated_file_fullname}
 #        PROPERTIES COMPILE_FLAGS "-bla")
 
 
@@ -33,144 +33,144 @@
 # (To distributed this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-SET(SWIG_CXX_EXTENSION "cxx")
-SET(SWIG_EXTRA_LIBRARIES "")
+set(SWIG_CXX_EXTENSION "cxx")
+set(SWIG_EXTRA_LIBRARIES "")
 
-SET(SWIG_PYTHON_EXTRA_FILE_EXTENSION "py")
+set(SWIG_PYTHON_EXTRA_FILE_EXTENSION "py")
 
 #
 # For given swig module initialize variables associated with it
 #
-MACRO(SWIG_MODULE_INITIALIZE name language)
-  STRING(TOUPPER "${language}" swig_uppercase_language)
-  STRING(TOLOWER "${language}" swig_lowercase_language)
-  SET(SWIG_MODULE_${name}_LANGUAGE "${swig_uppercase_language}")
-  SET(SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG "${swig_lowercase_language}")
+macro(SWIG_MODULE_INITIALIZE name language)
+  string(TOUPPER "${language}" swig_uppercase_language)
+  string(TOLOWER "${language}" swig_lowercase_language)
+  set(SWIG_MODULE_${name}_LANGUAGE "${swig_uppercase_language}")
+  set(SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG "${swig_lowercase_language}")
 
-  IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xUNKNOWNx$")
-    MESSAGE(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
-  ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xUNKNOWNx$")
+  if("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xUNKNOWNx$")
+    message(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
+  endif("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xUNKNOWNx$")
 
-  SET(SWIG_MODULE_${name}_REAL_NAME "${name}")
-  IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
+  set(SWIG_MODULE_${name}_REAL_NAME "${name}")
+  if("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
     # when swig is used without the -interface it will produce in the module.py
-    # a 'import _modulename' statement, which implies having a corresponding 
+    # a 'import _modulename' statement, which implies having a corresponding
     # _modulename.so (*NIX), _modulename.pyd (Win32).
-    SET(SWIG_MODULE_${name}_REAL_NAME "_${name}")
-  ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
-  IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xRUBYx$")
-    STRING(TOLOWER "${name}" ruby_module_name)
-    SET(SWIG_MODULE_${name}_REAL_NAME "${ruby_module_name}")
-  ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xRUBYx$")
-  IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
-    SET(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
-  ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
-ENDMACRO(SWIG_MODULE_INITIALIZE)
+    set(SWIG_MODULE_${name}_REAL_NAME "_${name}")
+  endif("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
+  if("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xRUBYx$")
+    string(TOLOWER "${name}" ruby_module_name)
+    set(SWIG_MODULE_${name}_REAL_NAME "${ruby_module_name}")
+  endif("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xRUBYx$")
+  if("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
+    set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
+  endif("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
+endmacro(SWIG_MODULE_INITIALIZE)
 
 #
 # For a given language, input file, and output file, determine extra files that
 # will be generated. This is internal swig macro.
 #
 
-MACRO(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
-  GET_SOURCE_FILE_PROPERTY(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename
+macro(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
+  get_source_file_property(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename
     ${infile} SWIG_MODULE_NAME)
-  IF(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename STREQUAL "NOTFOUND")
-    GET_FILENAME_COMPONENT(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename "${infile}" NAME_WE)
-  ENDIF(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename STREQUAL "NOTFOUND")
-  FOREACH(it ${SWIG_${language}_EXTRA_FILE_EXTENSION})
-    SET(${outfiles} ${${outfiles}}
+  if(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename STREQUAL "NOTFOUND")
+    get_filename_component(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename "${infile}" NAME_WE)
+  endif(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename STREQUAL "NOTFOUND")
+  foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSION})
+    set(${outfiles} ${${outfiles}}
       "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}.${it}")
-  ENDFOREACH(it)
-ENDMACRO(SWIG_GET_EXTRA_OUTPUT_FILES)
+  endforeach(it)
+endmacro(SWIG_GET_EXTRA_OUTPUT_FILES)
 
 #
 # Take swig (*.i) file and add proper custom commands for it
 #
-MACRO(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
-  SET(swig_full_infile ${infile})
-  GET_FILENAME_COMPONENT(swig_source_file_path "${infile}" PATH)
-  GET_FILENAME_COMPONENT(swig_source_file_name_we "${infile}" NAME_WE)
-  GET_SOURCE_FILE_PROPERTY(swig_source_file_generated ${infile} GENERATED)
-  GET_SOURCE_FILE_PROPERTY(swig_source_file_cplusplus ${infile} CPLUSPLUS)
-  GET_SOURCE_FILE_PROPERTY(swig_source_file_flags ${infile} SWIG_FLAGS)
-  IF("${swig_source_file_flags}" STREQUAL "NOTFOUND")
-    SET(swig_source_file_flags "")
-  ENDIF("${swig_source_file_flags}" STREQUAL "NOTFOUND")
-  SET(swig_source_file_fullname "${infile}")
-  IF(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
-    STRING(REGEX REPLACE 
+macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
+  set(swig_full_infile ${infile})
+  get_filename_component(swig_source_file_path "${infile}" PATH)
+  get_filename_component(swig_source_file_name_we "${infile}" NAME_WE)
+  get_source_file_property(swig_source_file_generated ${infile} GENERATED)
+  get_source_file_property(swig_source_file_cplusplus ${infile} CPLUSPLUS)
+  get_source_file_property(swig_source_file_flags ${infile} SWIG_FLAGS)
+  if("${swig_source_file_flags}" STREQUAL "NOTFOUND")
+    set(swig_source_file_flags "")
+  endif("${swig_source_file_flags}" STREQUAL "NOTFOUND")
+  set(swig_source_file_fullname "${infile}")
+  if(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
+    string(REGEX REPLACE
       "^${CMAKE_CURRENT_SOURCE_DIR}" ""
       swig_source_file_relative_path
       "${swig_source_file_path}")
-  ELSE(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
-    IF(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
-      STRING(REGEX REPLACE 
+  else(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
+    if(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
+      string(REGEX REPLACE
         "^${CMAKE_CURRENT_BINARY_DIR}" ""
         swig_source_file_relative_path
         "${swig_source_file_path}")
-      SET(swig_source_file_generated 1)
-    ELSE(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
-      SET(swig_source_file_relative_path "${swig_source_file_path}")
-      IF(swig_source_file_generated)
-        SET(swig_source_file_fullname "${CMAKE_CURRENT_BINARY_DIR}/${infile}")
-      ELSE(swig_source_file_generated)
-        SET(swig_source_file_fullname "${CMAKE_CURRENT_SOURCE_DIR}/${infile}")
-      ENDIF(swig_source_file_generated)
-    ENDIF(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
-  ENDIF(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
+      set(swig_source_file_generated 1)
+    else(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
+      set(swig_source_file_relative_path "${swig_source_file_path}")
+      if(swig_source_file_generated)
+        set(swig_source_file_fullname "${CMAKE_CURRENT_BINARY_DIR}/${infile}")
+      else(swig_source_file_generated)
+        set(swig_source_file_fullname "${CMAKE_CURRENT_SOURCE_DIR}/${infile}")
+      endif(swig_source_file_generated)
+    endif(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
+  endif(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
 
-  SET(swig_generated_file_fullname
+  set(swig_generated_file_fullname
     "${CMAKE_CURRENT_BINARY_DIR}")
-  IF(swig_source_file_relative_path)
-    SET(swig_generated_file_fullname
+  if(swig_source_file_relative_path)
+    set(swig_generated_file_fullname
       "${swig_generated_file_fullname}/${swig_source_file_relative_path}")
-  ENDIF(swig_source_file_relative_path)
+  endif(swig_source_file_relative_path)
   # If CMAKE_SWIG_OUTDIR was specified then pass it to -outdir
-  IF(CMAKE_SWIG_OUTDIR)
-    SET(swig_outdir ${CMAKE_SWIG_OUTDIR})
+  if(CMAKE_SWIG_OUTDIR)
+    set(swig_outdir ${CMAKE_SWIG_OUTDIR})
     # it may not exist, so create it:
     file(MAKE_DIRECTORY ${CMAKE_SWIG_OUTDIR})
-  ELSE(CMAKE_SWIG_OUTDIR)
-    SET(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
-  ENDIF(CMAKE_SWIG_OUTDIR)
+  else(CMAKE_SWIG_OUTDIR)
+    set(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
+  endif(CMAKE_SWIG_OUTDIR)
   SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
     swig_extra_generated_files
     "${swig_outdir}"
     "${infile}")
-  SET(swig_generated_file_fullname
+  set(swig_generated_file_fullname
     "${swig_generated_file_fullname}/${swig_source_file_name_we}")
   # add the language into the name of the file (i.e. TCL_wrap)
   # this allows for the same .i file to be wrapped into different languages
-  SET(swig_generated_file_fullname
+  set(swig_generated_file_fullname
     "${swig_generated_file_fullname}${SWIG_MODULE_${name}_LANGUAGE}_wrap")
 
-  IF(swig_source_file_cplusplus)
-    SET(swig_generated_file_fullname
+  if(swig_source_file_cplusplus)
+    set(swig_generated_file_fullname
       "${swig_generated_file_fullname}.${SWIG_CXX_EXTENSION}")
-  ELSE(swig_source_file_cplusplus)
-    SET(swig_generated_file_fullname
+  else(swig_source_file_cplusplus)
+    set(swig_generated_file_fullname
       "${swig_generated_file_fullname}.c")
-  ENDIF(swig_source_file_cplusplus)
+  endif(swig_source_file_cplusplus)
 
-  #MESSAGE("Full path to source file: ${swig_source_file_fullname}")
-  #MESSAGE("Full path to the output file: ${swig_generated_file_fullname}")
-  GET_DIRECTORY_PROPERTY(cmake_include_directories INCLUDE_DIRECTORIES)
-  SET(swig_include_dirs)
-  FOREACH(it ${cmake_include_directories})
-    SET(swig_include_dirs ${swig_include_dirs} "-I${it}")
-  ENDFOREACH(it)
+  #message("Full path to source file: ${swig_source_file_fullname}")
+  #message("Full path to the output file: ${swig_generated_file_fullname}")
+  get_directory_property(cmake_include_directories INCLUDE_DIRECTORIES)
+  set(swig_include_dirs)
+  foreach(it ${cmake_include_directories})
+    set(swig_include_dirs ${swig_include_dirs} "-I${it}")
+  endforeach(it)
 
-  SET(swig_special_flags)
+  set(swig_special_flags)
   # default is c, so add c++ flag if it is c++
-  IF(swig_source_file_cplusplus)
-    SET(swig_special_flags ${swig_special_flags} "-c++")
-  ENDIF(swig_source_file_cplusplus)
-  SET(swig_extra_flags)
-  IF(SWIG_MODULE_${name}_EXTRA_FLAGS)
-    SET(swig_extra_flags ${swig_extra_flags} ${SWIG_MODULE_${name}_EXTRA_FLAGS})
-  ENDIF(SWIG_MODULE_${name}_EXTRA_FLAGS)
-  ADD_CUSTOM_COMMAND(
+  if(swig_source_file_cplusplus)
+    set(swig_special_flags ${swig_special_flags} "-c++")
+  endif(swig_source_file_cplusplus)
+  set(swig_extra_flags)
+  if(SWIG_MODULE_${name}_EXTRA_FLAGS)
+    set(swig_extra_flags ${swig_extra_flags} ${SWIG_MODULE_${name}_EXTRA_FLAGS})
+  endif(SWIG_MODULE_${name}_EXTRA_FLAGS)
+  add_custom_command(
     OUTPUT "${swig_generated_file_fullname}" ${swig_extra_generated_files}
     COMMAND "${SWIG_EXECUTABLE}"
     ARGS "-${SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG}"
@@ -184,54 +184,54 @@ MACRO(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
     "${swig_source_file_fullname}"
     MAIN_DEPENDENCY "${swig_source_file_fullname}"
     DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
-    COMMENT "Swig source to generate ${SWIG_MODULE_${name}_LANGUAGE} wrapping") 
-  SET_SOURCE_FILES_PROPERTIES("${swig_generated_file_fullname}" ${swig_extra_generated_files}
+    COMMENT "Swig source to generate ${SWIG_MODULE_${name}_LANGUAGE} wrapping")
+  set_source_files_properties("${swig_generated_file_fullname}" ${swig_extra_generated_files}
     PROPERTIES GENERATED 1)
-  SET(${outfiles} "${swig_generated_file_fullname}" ${swig_extra_generated_files})
-ENDMACRO(SWIG_ADD_SOURCE_TO_MODULE)
+  set(${outfiles} "${swig_generated_file_fullname}" ${swig_extra_generated_files})
+endmacro(SWIG_ADD_SOURCE_TO_MODULE)
 
 #
 # Create Swig module
 #
-MACRO(SWIG_ADD_MODULE name language)
+macro(SWIG_ADD_MODULE name language)
   SWIG_MODULE_INITIALIZE(${name} ${language})
-  SET(swig_dot_i_sources)
-  SET(swig_other_sources)
-  FOREACH(it ${ARGN})
-    IF(${it} MATCHES ".*\\.i$")
-      SET(swig_dot_i_sources ${swig_dot_i_sources} "${it}")
-    ELSE(${it} MATCHES ".*\\.i$")
-      SET(swig_other_sources ${swig_other_sources} "${it}")
-    ENDIF(${it} MATCHES ".*\\.i$")
-  ENDFOREACH(it)
+  set(swig_dot_i_sources)
+  set(swig_other_sources)
+  foreach(it ${ARGN})
+    if(${it} MATCHES ".*\\.i$")
+      set(swig_dot_i_sources ${swig_dot_i_sources} "${it}")
+    else(${it} MATCHES ".*\\.i$")
+      set(swig_other_sources ${swig_other_sources} "${it}")
+    endif(${it} MATCHES ".*\\.i$")
+  endforeach(it)
 
-  SET(swig_generated_sources)
-  FOREACH(it ${swig_dot_i_sources})
+  set(swig_generated_sources)
+  foreach(it ${swig_dot_i_sources})
     SWIG_ADD_SOURCE_TO_MODULE(${name} swig_generated_source ${it})
-    SET(swig_generated_sources ${swig_generated_sources} "${swig_generated_source}")
-  ENDFOREACH(it)
-  GET_DIRECTORY_PROPERTY(swig_extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-  SET_DIRECTORY_PROPERTIES(PROPERTIES
+    set(swig_generated_sources ${swig_generated_sources} "${swig_generated_source}")
+  endforeach(it)
+  get_directory_property(swig_extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
+  set_directory_properties(PROPERTIES
     ADDITIONAL_MAKE_CLEAN_FILES "${swig_extra_clean_files};${swig_generated_sources}")
-  ADD_LIBRARY(${SWIG_MODULE_${name}_REAL_NAME}
+  add_library(${SWIG_MODULE_${name}_REAL_NAME}
     MODULE
     ${swig_generated_sources}
     ${swig_other_sources})
-  STRING(TOLOWER "${language}" swig_lowercase_language)
-  IF ("${swig_lowercase_language}" STREQUAL "java")
-    IF (APPLE)
+  string(TOLOWER "${language}" swig_lowercase_language)
+  if("${swig_lowercase_language}" STREQUAL "java")
+    if(APPLE)
         # In java you want:
         #      System.loadLibrary("LIBRARY");
         # then JNI will look for a library whose name is platform dependent, namely
         #   MacOS  : libLIBRARY.jnilib
         #   Windows: LIBRARY.dll
         #   Linux  : libLIBRARY.so
-        SET_TARGET_PROPERTIES (${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".jnilib")
-      ENDIF (APPLE)
-  ENDIF ("${swig_lowercase_language}" STREQUAL "java")
-  IF ("${swig_lowercase_language}" STREQUAL "python")
+        set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".jnilib")
+      endif(APPLE)
+  endif("${swig_lowercase_language}" STREQUAL "java")
+  if("${swig_lowercase_language}" STREQUAL "python")
     # this is only needed for the python case where a _modulename.so is generated
-    SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
+    set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
     # Python extension modules on Windows must have the extension ".pyd"
     # instead of ".dll" as of Python 2.5.  Older python versions do support
     # this suffix.
@@ -240,27 +240,27 @@ MACRO(SWIG_ADD_MODULE name language)
     # Windows: .dll is no longer supported as a filename extension for extension modules.
     # .pyd is now the only filename extension that will be searched for.
     # </quote>
-    IF(WIN32 AND NOT CYGWIN)
-      SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".pyd")
-    ENDIF(WIN32 AND NOT CYGWIN)
-  ENDIF ("${swig_lowercase_language}" STREQUAL "python")
-  IF ("${swig_lowercase_language}" STREQUAL "ruby")
-    SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
-    IF(APPLE)
-      SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".bundle")
-      SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES COMPILE_FLAGS "-bundle")
-    ENDIF(APPLE)
-  ENDIF ("${swig_lowercase_language}" STREQUAL "ruby")
-ENDMACRO(SWIG_ADD_MODULE)
+    if(WIN32 AND NOT CYGWIN)
+      set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".pyd")
+    endif(WIN32 AND NOT CYGWIN)
+  endif("${swig_lowercase_language}" STREQUAL "python")
+  if("${swig_lowercase_language}" STREQUAL "ruby")
+    set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
+    if(APPLE)
+      set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".bundle")
+      set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES COMPILE_FLAGS "-bundle")
+    endif(APPLE)
+  endif("${swig_lowercase_language}" STREQUAL "ruby")
+endmacro(SWIG_ADD_MODULE)
 
 #
 # Like TARGET_LINK_LIBRARIES but for swig modules
 #
-MACRO(SWIG_LINK_LIBRARIES name)
-  IF(SWIG_MODULE_${name}_REAL_NAME)
-    TARGET_LINK_LIBRARIES(${SWIG_MODULE_${name}_REAL_NAME} ${ARGN})
-  ELSE(SWIG_MODULE_${name}_REAL_NAME)
-    MESSAGE(SEND_ERROR "Cannot find Swig library \"${name}\".")
-  ENDIF(SWIG_MODULE_${name}_REAL_NAME)
-ENDMACRO(SWIG_LINK_LIBRARIES name)
+macro(SWIG_LINK_LIBRARIES name)
+  if(SWIG_MODULE_${name}_REAL_NAME)
+    target_link_libraries(${SWIG_MODULE_${name}_REAL_NAME} ${ARGN})
+  else(SWIG_MODULE_${name}_REAL_NAME)
+    message(SEND_ERROR "Cannot find Swig library \"${name}\".")
+  endif(SWIG_MODULE_${name}_REAL_NAME)
+endmacro(SWIG_LINK_LIBRARIES name)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index defa2d485021057cf23f747f8745a3bd73d88da9..26bd0e09bd4e9a897848294aa408c224366482a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,45 +1,44 @@
-PROJECT(OTB-Wrapper)
+project(OTB-Wrapper)
 
 cmake_minimum_required(VERSION 2.6)
 
-IF(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0003 NEW)
-ENDIF(COMMAND CMAKE_POLICY)
+if(COMMAND CMAKE_POLICY)
+  cmake_policy(SET CMP0003 NEW)
+endif(COMMAND CMAKE_POLICY)
 
 # Path to additional CMake modules
-SET(CMAKE_MODULE_PATH
+set(CMAKE_MODULE_PATH
     ${CMAKE_SOURCE_DIR}/CMake
     ${CMAKE_MODULE_PATH})
 
 include(Definitions)
 
 # Link to the Orfeo ToolBox
-FIND_PACKAGE(OTB REQUIRED PATHS /usr/lib/otb )
-INCLUDE(${OTB_USE_FILE})
+find_package(OTB REQUIRED PATHS /usr/lib/otb )
+include(${OTB_USE_FILE})
 
-SET(BUILD_SHARED_LIBS ${OTB_BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS ${OTB_BUILD_SHARED_LIBS})
 
-ADD_SUBDIRECTORY(Code)
-ADD_SUBDIRECTORY(Example)
+add_subdirectory(Code)
+add_subdirectory(Example)
 
 # Enable / Disable testing
-OPTION(BUILD_TESTING  "Build testing." OFF)
-
-INCLUDE(${CMAKE_ROOT}/Modules/Dart.cmake)
-MARK_AS_ADVANCED(TCL_TCLSH DART_ROOT)
-IF(BUILD_TESTING)
-  ENABLE_TESTING()
-  
-  # configure the test driver
-  FIND_PROGRAM(OTB_TEST_DRIVER otbTestDriver PATHS ${OTB_DIR}/bin ${OTB_DIR}/../../bin DOC "Path to the otbTestDriver executable from OTB")
-  
-  FIND_PATH(OTB_DATA_ROOT README-OTB-Data PATHS $ENV{OTB_DATA_ROOT} ${OTB_SOURCE_DIR}/../OTB-Data)
-  MARK_AS_ADVANCED(OTB_DATA_ROOT)
-  
-  SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
-  MARK_AS_ADVANCED(BUILDNAME)
-  ADD_SUBDIRECTORY(Testing)
-ENDIF(BUILD_TESTING)
+option(BUILD_TESTING  "Build testing." OFF)
+
+include(${CMAKE_ROOT}/Modules/Dart.cmake)
+mark_as_advanced(TCL_TCLSH DART_ROOT)
+if(BUILD_TESTING)
+  enable_testing()
+
+  find_program(OTB_TEST_DRIVER otbTestDriver PATHS ${OTB_DIR}/bin ${OTB_DIR}/../../bin DOC "Path to the otbTestDriver executable from OTB")
+
+  find_path(OTB_DATA_ROOT README-OTB-Data PATHS $ENV{OTB_DATA_ROOT} ${OTB_SOURCE_DIR}/../OTB-Data)
+  mark_as_advanced(OTB_DATA_ROOT)
+
+  set(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
+  mark_as_advanced(BUILDNAME)
+  add_subdirectory(Testing)
+endif(BUILD_TESTING)
 
 
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index bda0241035b1b76488759c6f981047eea4658610..443768ba2437dd64543840cc9bb66db5860aea2c 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -2,8 +2,8 @@
 ## Then modify the CMakeLists.txt file in the root directory of your
 ## project to incorporate the testing dashboard.
 ## # The following are required to uses Dart and the Cdash dashboard
-##   ENABLE_TESTING()
-##   INCLUDE(Dart)
+##   enable_testing()
+##   include(Dart)
 set(CTEST_PROJECT_NAME "OTB-Wrapper")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
index 6ebfcb0a63e1683e4d8be1f48374a326c3cd154d..b656c750db8f17bb159e05192f43947dea36086d 100644
--- a/Code/CMakeLists.txt
+++ b/Code/CMakeLists.txt
@@ -1,2 +1,2 @@
-ADD_SUBDIRECTORY(Core)
-ADD_SUBDIRECTORY(Wrappers)
+add_subdirectory(Core)
+add_subdirectory(Wrappers)
diff --git a/Code/Core/CMakeLists.txt b/Code/Core/CMakeLists.txt
index a011e5dd2bc407f9fde907cc123341a46d208cf0..7264f2f73c045da7caaddb4b4e1677b5c3033d12 100644
--- a/Code/Core/CMakeLists.txt
+++ b/Code/Core/CMakeLists.txt
@@ -1,4 +1,4 @@
-FILE(GLOB srcs "*.cxx")
+file(GLOB srcs "*.cxx")
 
-ADD_LIBRARY(OTBWrapperCore ${srcs})
-TARGET_LINK_LIBRARIES(OTBWrapperCore OTBCommon OTBIO)
+add_library(OTBWrapperCore ${srcs})
+target_link_libraries(OTBWrapperCore OTBCommon OTBIO)
diff --git a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
index ba822eeaa3c470c8c641b540816b17b26ad19b93..9f3beb6b99c6ed348f37d8c1bb9418293a5dbdc2 100644
--- a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
+++ b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
@@ -1,12 +1,12 @@
-INCLUDE_DIRECTORIES(${QT_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(../QtWidget)
+include_directories(${QT_INCLUDE_DIRS})
+include_directories(../QtWidget)
 
-SET( SRCS
+set( SRCS
      otbApplicationLauncherQt.cxx )
 
-ADD_EXECUTABLE(otbApplicationLauncherQt ${SRCS})
+add_executable(otbApplicationLauncherQt ${SRCS})
 
-TARGET_LINK_LIBRARIES(otbApplicationLauncherQt
+target_link_libraries(otbApplicationLauncherQt
                        OTBWrapperQtWidget
                        OTBWrapperCore
                        ${QT_LIBRARIES})
diff --git a/Code/Wrappers/CMakeLists.txt b/Code/Wrappers/CMakeLists.txt
index 55cdae1feb5980f26b58457ba22ffda8fe34005c..2d35c0d19c767079eb0fbfda5558d497ef8ff1ec 100644
--- a/Code/Wrappers/CMakeLists.txt
+++ b/Code/Wrappers/CMakeLists.txt
@@ -1,12 +1,12 @@
-INCLUDE_DIRECTORIES(../Core)
+include_directories(../Core)
 
 # Generate Qt based GUI
 option ( WRAP_QT "Enable Qt wrappers" OFF )
 
 if ( WRAP_QT )
-  FIND_PACKAGE(Qt4 REQUIRED)
-  SET(QT_USE_QTXML 1)
-  INCLUDE(${QT_USE_FILE})
+  find_package(Qt4 REQUIRED)
+  set(QT_USE_QTXML 1)
+  include(${QT_USE_FILE})
 
   add_subdirectory(ApplicationLauncherQt)
   add_subdirectory(QtWidget)
@@ -16,4 +16,4 @@ endif( WRAP_QT )
 option ( WRAP_SWIG "Enable SWIG wrappers" OFF )
 if ( WRAP_SWIG )
   add_subdirectory(SWIG)
-endif( WRAP_SWIG )
\ No newline at end of file
+endif( WRAP_SWIG )
diff --git a/Code/Wrappers/QgisProcessing/otb/CMakeLists.txt b/Code/Wrappers/QgisProcessing/otb/CMakeLists.txt
index e7ffbe750ae4c6b1060a0d8456eebb293f5bdae1..846d077d008773912e4f9824b536e583a3703274 100644
--- a/Code/Wrappers/QgisProcessing/otb/CMakeLists.txt
+++ b/Code/Wrappers/QgisProcessing/otb/CMakeLists.txt
@@ -1,8 +1,8 @@
-FILE(GLOB INSTALLER_FILES *.py)
-SET(INSTALLER_FILES ${INSTALLER_FILES})
+file(GLOB INSTALLER_FILES *.py)
+set(INSTALLER_FILES ${INSTALLER_FILES})
 
-ADD_CUSTOM_TARGET(otb ALL)
+add_custom_target(otb ALL)
 
-INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/otb)
+install(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/otb)
 
 
diff --git a/Code/Wrappers/QtWidget/CMakeLists.txt b/Code/Wrappers/QtWidget/CMakeLists.txt
index f7ebaddfb3fb17c13c74f29abeaea8ec401a9eee..d791b160522314712fbfa9d7eff9501de0dd545c 100644
--- a/Code/Wrappers/QtWidget/CMakeLists.txt
+++ b/Code/Wrappers/QtWidget/CMakeLists.txt
@@ -1,7 +1,7 @@
-INCLUDE_DIRECTORIES(${QT_INCLUDE_DIRS})
-FILE(GLOB srcs "*.cxx")
+include_directories(${QT_INCLUDE_DIRS})
+file(GLOB srcs "*.cxx")
 
-SET( WrappersQtWidget_MOC_HDR
+set( WrappersQtWidget_MOC_HDR
        otbWrapperQtWidgetEmptyParameter.h
        otbWrapperQtWidgetFloatParameter.h
        otbWrapperQtWidgetIntParameter.h
@@ -12,11 +12,11 @@ SET( WrappersQtWidget_MOC_HDR
        otbWrapperQtWidgetParameterGroup.h
        otbWrapperQtWidgetParameterLabel.h
        otbWrapperQtWidgetParameterBase.h
-       otbWrapperQtWidgetModel.h      
-       otbWrapperQtWidgetView.h  
+       otbWrapperQtWidgetModel.h
+       otbWrapperQtWidgetView.h
        )
 
 QT4_WRAP_CPP(WrappersQtWidget_MOC_SRC ${WrappersQtWidget_MOC_HDR})
 
-ADD_LIBRARY(OTBWrapperQtWidget ${srcs} ${WrappersQtWidget_MOC_SRC})
-TARGET_LINK_LIBRARIES(OTBWrapperQtWidget OTBCommon OTBIO OTBWrapperCore ${QT_LIBRARIES})
+add_library(OTBWrapperQtWidget ${srcs} ${WrappersQtWidget_MOC_SRC})
+target_link_libraries(OTBWrapperQtWidget OTBCommon OTBIO OTBWrapperCore ${QT_LIBRARIES})
diff --git a/Code/Wrappers/SWIG/CMakeLists.txt b/Code/Wrappers/SWIG/CMakeLists.txt
index ee7f61c999b6ae509ef1beb6b2e749d0b28b7444..08bd9f1ef3374418e0daf8a1860c17efaa760983 100644
--- a/Code/Wrappers/SWIG/CMakeLists.txt
+++ b/Code/Wrappers/SWIG/CMakeLists.txt
@@ -76,7 +76,7 @@ if ( WRAP_LUA OR WRAP_PYTHON OR WRAP_JAVA OR WRAP_CSHARP OR WRAP_TCL OR WRAP_R O
      )
 
   set ( SWIG_MODULE_otbApplication_EXTRA_DEPS ${SWIG_HEADERS} )
-  
+
   include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 endif()
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 61018d712e1ba727d9e53ab988f5feb4870333ba..e99eb5e6b6ab8ec22aa7589387663a6010510185 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,5 +1,5 @@
-SET(TEMP ${CMAKE_BINARY_DIR}/Testing/Temporary)
-FILE(MAKE_DIRECTORY ${TEMP})
+set(TEMP ${CMAKE_BINARY_DIR}/Testing/Temporary)
+file(MAKE_DIRECTORY ${TEMP})
 
 add_subdirectory(Core)
 
diff --git a/Testing/Core/CMakeLists.txt b/Testing/Core/CMakeLists.txt
index fb7d1f0dbdc0463b842c5e206a047a87dcadfa47..faf7c3fe40d9ebed4a48a62f261e8d2bff105586 100644
--- a/Testing/Core/CMakeLists.txt
+++ b/Testing/Core/CMakeLists.txt
@@ -1,38 +1,38 @@
-SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
+set(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
-IF(WIN32)
-  ADD_DEFINITIONS(-DWIN32)
-ENDIF(WIN32)
+if(WIN32)
+  add_definitions(-DWIN32)
+endif(WIN32)
 
-SET(OTB_WRAPPER_TESTS ${CXX_TEST_PATH}/otbWrapperTests)
+set(OTB_WRAPPER_TESTS ${CXX_TEST_PATH}/otbWrapperTests)
 
 
-ADD_TEST(owTuParameterNew ${OTB_WRAPPER_TESTS}
+add_test(owTuParameterNew ${OTB_WRAPPER_TESTS}
 	otbWrapperParameterNew
   )
 
-ADD_TEST(owTvParameter ${OTB_WRAPPER_TESTS}
+add_test(owTvParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperParameterTest1
 	"param1"
   )
-  
-  
+
+
 # NumericalParameter class test
-ADD_TEST(owTuNumericalParameter ${OTB_WRAPPER_TESTS}
+add_test(owTuNumericalParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperNumericalParameterNew
-  ) 
-  
+  )
+
 # EmptyParameter class test
-ADD_TEST(owTuEmptyParameter ${OTB_WRAPPER_TESTS}
+add_test(owTuEmptyParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperEmptyParameterNew
   )
-  
+
 # NumericalParameter class test
-ADD_TEST(owTuNumericalParameter ${OTB_WRAPPER_TESTS}
+add_test(owTuNumericalParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperNumericalParameterNew
   )
 
-ADD_TEST(owTvNumericalParameter ${OTB_WRAPPER_TESTS}
+add_test(owTvNumericalParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperNumericalParameterTest1
 	42.42
 	"mykey"
@@ -40,28 +40,28 @@ ADD_TEST(owTvNumericalParameter ${OTB_WRAPPER_TESTS}
   )
 
 # Input Image parameter class test
-ADD_TEST(owTuInputImageParameter ${OTB_WRAPPER_TESTS}
+add_test(owTuInputImageParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperInputImageParameterNew
   )
-    
+
 # Input VectorData parameter class test
-ADD_TEST(owTuInputVectorDataParameter ${OTB_WRAPPER_TESTS}
+add_test(owTuInputVectorDataParameter ${OTB_WRAPPER_TESTS}
     otbWrapperInputVectorDataParameterNew
   )
 
 # Application class test
-ADD_TEST(owTuApplication ${OTB_WRAPPER_TESTS}
+add_test(owTuApplication ${OTB_WRAPPER_TESTS}
 	otbWrapperApplicationNew
   )
 
 # Application class test
-ADD_TEST(owTvApplicationRegistry ${OTB_WRAPPER_TESTS}
+add_test(owTvApplicationRegistry ${OTB_WRAPPER_TESTS}
     otbWrapperApplicationRegistry
   )
 
 # ----------------Source files CXX -----------------------------------
 
-SET(Wrapper_SRCS
+set(Wrapper_SRCS
 otbWrapperCoreTests.cxx
 
 otbWrapperApplicationTest.cxx
@@ -76,6 +76,6 @@ otbWrapperParameterTest.cxx
 otbWrapperApplicationRegistryTest.cxx
 )
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Code/Core)
-ADD_EXECUTABLE(otbWrapperTests ${Wrapper_SRCS})
-TARGET_LINK_LIBRARIES(otbWrapperTests OTBIO OTBCommon ITKIO ITKCommon OTBTesting OTBWrapperCore)
+include_directories(${CMAKE_SOURCE_DIR}/Code/Core)
+add_executable(otbWrapperTests ${Wrapper_SRCS})
+target_link_libraries(otbWrapperTests OTBIO OTBCommon ITKIO ITKCommon OTBTesting OTBWrapperCore)
diff --git a/Testing/Java/CMakeLists.txt b/Testing/Java/CMakeLists.txt
index 5bddf6844321948bc9c330630dd4ee51b2b2622f..b4ad74bdcd93daf6b82fd3e3e29cf0c19df5def3 100644
--- a/Testing/Java/CMakeLists.txt
+++ b/Testing/Java/CMakeLists.txt
@@ -1,6 +1,6 @@
 include( UseJava )
 
-SET(TEST_DRIVER "${OTB_TEST_DRIVER}"
+set(TEST_DRIVER "${OTB_TEST_DRIVER}"
     --add-before-env ITK_AUTOLOAD_PATH "${CMAKE_BINARY_DIR}/Example"
 )
 
diff --git a/Testing/Lua/CMakeLists.txt b/Testing/Lua/CMakeLists.txt
index f0591915ade84279b2db0eedbc8093c409d8827d..9752bd30d294dce173e6b3841cca828a25ac8716 100644
--- a/Testing/Lua/CMakeLists.txt
+++ b/Testing/Lua/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-SET(TEST_DRIVER "${OTB_TEST_DRIVER}"
-    --add-before-env LD_LIBRARY_PATH   "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG" 
+set(TEST_DRIVER "${OTB_TEST_DRIVER}"
+    --add-before-env LD_LIBRARY_PATH   "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG"
     --add-before-env ITK_AUTOLOAD_PATH "${CMAKE_BINARY_DIR}/Example"
 )
 
-ADD_TEST( NAME luTvSmoothing
+add_test( NAME luTvSmoothing
           COMMAND ${TEST_DRIVER} Execute
                   ${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG/otbApplicationLua
                   ${CMAKE_CURRENT_SOURCE_DIR}/LuaSmoothingTest.lua
diff --git a/Testing/Python/CMakeLists.txt b/Testing/Python/CMakeLists.txt
index 8228e4e3e7bfa8274bf3e79606d3309dec0818b6..7d3c7d2888d9fa07f4b885decdcedfb76a9afc8f 100644
--- a/Testing/Python/CMakeLists.txt
+++ b/Testing/Python/CMakeLists.txt
@@ -1,11 +1,11 @@
 
-SET(TEST_DRIVER "${OTB_TEST_DRIVER}"
-    --add-before-env PYTHONPATH        "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG" 
+set(TEST_DRIVER "${OTB_TEST_DRIVER}"
+    --add-before-env PYTHONPATH        "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG"
     --add-before-env ITK_AUTOLOAD_PATH "${CMAKE_BINARY_DIR}/Example"
 )
 
-ADD_TEST( NAME pyTvSmoothing
+add_test( NAME pyTvSmoothing
           COMMAND ${TEST_DRIVER} Execute
-                  ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/PythonSmoothingTest.py 
+                  ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/PythonSmoothingTest.py
                   ${OTB_DATA_ROOT}/Input/ToulouseExtract_WithGeom.tif
                   ${TEMP}/pyTvSmoothing_ )
diff --git a/Testing/QtWidget/CMakeLists.txt b/Testing/QtWidget/CMakeLists.txt
index eb44c0a67b2e90aadffd8667f6495a0717b6761a..fa579c1e13fe178b46967e179d18815076897cc0 100644
--- a/Testing/QtWidget/CMakeLists.txt
+++ b/Testing/QtWidget/CMakeLists.txt
@@ -1,29 +1,29 @@
-FIND_PACKAGE(Qt4 REQUIRED)
-SET(QT_USE_QTXML 1)
-INCLUDE(${QT_USE_FILE})
+find_package(Qt4 REQUIRED)
+set(QT_USE_QTXML 1)
+include(${QT_USE_FILE})
 
-SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
+set(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
-SET(OTB_WRAPPER_QTWIDGET_TESTS ${CXX_TEST_PATH}/otbWrapperQtWidgetTests)
+set(OTB_WRAPPER_QTWIDGET_TESTS ${CXX_TEST_PATH}/otbWrapperQtWidgetTests)
 
-SET(WrapperQtWidget_SRCS
+set(WrapperQtWidget_SRCS
     otbWrapperQtWidgetTests.cxx
     otbWrapperQtWidgetParameterFactory.cxx)
 
-INCLUDE_DIRECTORIES(${QT_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Code/Core)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Code/Wrappers/QtWidget)
+include_directories(${QT_INCLUDE_DIRS})
+include_directories(${CMAKE_SOURCE_DIR}/Code/Core)
+include_directories(${CMAKE_SOURCE_DIR}/Code/Wrappers/QtWidget)
 
-ADD_EXECUTABLE(otbWrapperQtWidgetTests ${WrapperQtWidget_SRCS})
-TARGET_LINK_LIBRARIES(otbWrapperQtWidgetTests
+add_executable(otbWrapperQtWidgetTests ${WrapperQtWidget_SRCS})
+target_link_libraries(otbWrapperQtWidgetTests
                         OTBIO
                         OTBCommon
                         OTBTesting
                         OTBWrapperCore
                         OTBWrapperQtWidget)
 
-ADD_TEST(owTvQtWidgetParameterFactory ${OTB_WRAPPER_QTWIDGET_TESTS}
+add_test(owTvQtWidgetParameterFactory ${OTB_WRAPPER_QTWIDGET_TESTS}
         otbWrapperQtWidgetParameterFactory)
 
-ADD_TEST(owTvQtWidgetParameterGroup ${OTB_WRAPPER_QTWIDGET_TESTS}
+add_test(owTvQtWidgetParameterGroup ${OTB_WRAPPER_QTWIDGET_TESTS}
         otbWrapperQtWidgetParameterGroup)
diff --git a/Testing/Ruby/CMakeLists.txt b/Testing/Ruby/CMakeLists.txt
index b0138171581dd58997da5e622a7c1b7c85d7f80c..099aa0fba66b005cff7df5331aed92f6482f55df 100644
--- a/Testing/Ruby/CMakeLists.txt
+++ b/Testing/Ruby/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-SET(TEST_DRIVER "${OTB_TEST_DRIVER}"
-    --add-before-env LD_LIBRARY_PATH   "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG" 
+set(TEST_DRIVER "${OTB_TEST_DRIVER}"
+    --add-before-env LD_LIBRARY_PATH   "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG"
     --add-before-env ITK_AUTOLOAD_PATH "${CMAKE_BINARY_DIR}/Example"
 )
 
-ADD_TEST( NAME rbTvSmoothing
+add_test( NAME rbTvSmoothing
           COMMAND ${TEST_DRIVER} Execute
                   ${RUBY_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/RubySmoothingTest.rb
                   ${OTB_DATA_ROOT}/Input/ToulouseExtract_WithGeom.tif