STYLE: Fix indent following removal of obsolete CMake code

This is introduced as a separated commit so that .git-blame-ignore-revs can be updated.
commontk · Jul 19, 2023 · bd5bc16 · bd5bc16
1 parent 2623ff2
commit bd5bc16
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/CMake/CTKConfig.cmake.in b/CMake/CTKConfig.cmake.in
@@ -75,7 +75,7 @@ include("${CTK_CMAKE_DIR}/ctkFunctionGetPluginDependencies.cmake")
 include("${CTK_CMAKE_DIR}/ctkMacroSetupPlugins.cmake")
 include("${CTK_CMAKE_DIR}/ctkMacroGenerateMocs.cmake")
 
- include(CMakeFindDependencyMacro)
+include(CMakeFindDependencyMacro)
 
 # List all libraries
 SET(CTK_LIBRARIES @CTK_LIBRARIES@)

diff --git a/CMake/LastConfigureStep/CTKGenerateCTKConfig.cmake b/CMake/LastConfigureStep/CTKGenerateCTKConfig.cmake
@@ -174,7 +174,7 @@ set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# External project libraries\n")
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_EXTERNAL_LIBRARIES \"${CTK_EXTERNAL_LIBRARIES}\")\n")
 if(DEFINED DCMTK_HAVE_CONFIG_H_OPTIONAL AND NOT DCMTK_HAVE_CONFIG_H_OPTIONAL AND TARGET CTKDICOMCore)
  set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# Definition required to build DCMTK dependent libraries\n")
- set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE} set_target_properties(CTKDICOMCore PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})\n")
+ set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set_target_properties(CTKDICOMCore PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})\n")
 endif()
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}##################################################")
 
@@ -228,7 +228,7 @@ foreach(lib ${CTK_LIBRARIES})
 endforeach()
 if(DEFINED DCMTK_HAVE_CONFIG_H_OPTIONAL AND NOT DCMTK_HAVE_CONFIG_H_OPTIONAL AND TARGET CTKDICOMCore)
  set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# Definition required to build DCMTK dependent libraries\n")
- set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE} set_target_properties(CTKDICOMCore PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})\n")
+ set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set_target_properties(CTKDICOMCore PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})\n")
 endif()
 
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}##################################################")

diff --git a/CMake/ctkMacroBuildPlugin.cmake b/CMake/ctkMacroBuildPlugin.cmake
@@ -290,28 +290,28 @@ macro(ctkMacroBuildPlugin)
  ${_plugin_qm_files}
  )
 
- target_include_directories(${lib_name}
- PUBLIC "$<BUILD_INTERFACE:${my_includes}>"
- "$<INSTALL_INTERFACE:${CTK_INSTALL_PLUGIN_INCLUDE_DIR}/${Plugin-SymbolicName}>"
- )
- if(CTK_QT_VERSION VERSION_LESS "5")
- # Add Qt include dirs to the target
- target_include_directories(${lib_name} PUBLIC ${QT_INCLUDE_DIR})
- foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
- QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP
- QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST
- QTDBUS QTXML QTSQL QTNETWORK QTCORE)
- if (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
- if (QT_${module}_FOUND)
- target_include_directories(${lib_name} PUBLIC ${QT_${module}_INCLUDE_DIR})
- endif ()
+ target_include_directories(${lib_name}
+ PUBLIC "$<BUILD_INTERFACE:${my_includes}>"
+ "$<INSTALL_INTERFACE:${CTK_INSTALL_PLUGIN_INCLUDE_DIR}/${Plugin-SymbolicName}>"
+ )
+ if(CTK_QT_VERSION VERSION_LESS "5")
+ # Add Qt include dirs to the target
+ target_include_directories(${lib_name} PUBLIC ${QT_INCLUDE_DIR})
+ foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
+ QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP
+ QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST
+ QTDBUS QTXML QTSQL QTNETWORK QTCORE)
+ if (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
+ if (QT_${module}_FOUND)
+ target_include_directories(${lib_name} PUBLIC ${QT_${module}_INCLUDE_DIR})
  endif ()
- endforeach()
- endif()
+ endif ()
+ endforeach()
+ endif()
 
  if(MY_TEST_PLUGIN AND CTK_QT_VERSION VERSION_GREATER "4")
  find_package(Qt5Test REQUIRED)
-  target_link_libraries(${lib_name} PRIVATE Qt5::Test)
+ target_link_libraries(${lib_name} PRIVATE Qt5::Test)
  endif()
 
  # Set the output directory for the plugin
@@ -373,7 +373,7 @@ macro(ctkMacroBuildPlugin)
  list(APPEND my_libs ssp) # add stack smash protection lib
  endif()
 
-  target_link_libraries(${lib_name} PUBLIC ${my_libs})
+ target_link_libraries(${lib_name} PUBLIC ${my_libs})
 
  if(NOT MY_TEST_PLUGIN)
  set(${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES} ${lib_name} CACHE INTERNAL "CTK plugins" FORCE)
@@ -391,3 +391,4 @@ macro(ctkMacroBuildPlugin)
 
 endmacro()
 
+
diff --git a/Libs/DICOM/Core/CMakeLists.txt b/Libs/DICOM/Core/CMakeLists.txt
@@ -111,7 +111,7 @@ ctkMacroBuildLib(
 if(DEFINED DCMTK_HAVE_CONFIG_H_OPTIONAL AND NOT DCMTK_HAVE_CONFIG_H_OPTIONAL)
  # Workaround Debian packaging issue - See FindDCMTK.cmake for more details
  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})
-  set_target_properties(${PROJECT_NAME} PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})
+ set_target_properties(${PROJECT_NAME} PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${DCMTK_DEFINITIONS})
 endif()