cmake-lint, cmake-format CMake files

python/CMakeLists.txt

@@ -12,19 +12,19 @@ set(PYTHON_BINDING_NAMESPACE "PyKDDockWidgets")
 
 # Just to fix warnings with --warn-uninitialized
 if(NOT DEFINED SHIBOKEN_CUSTOM_PREFIX) #look for shiboken in a custom location
-  set(SHIBOKEN_CUSTOM_PREFIX "")
+    set(SHIBOKEN_CUSTOM_PREFIX "")
 endif()
 if(NOT DEFINED PYSIDE_CUSTOM_PREFIX) #look for pyside in a custom location
-  set(PYSIDE_CUSTOM_PREFIX "")
+    set(PYSIDE_CUSTOM_PREFIX "")
 endif()
 
 if(${PROJECT_NAME}_QT6)
-  set(PYSIDE_MAJOR_VERSION "6")
-  set(PYTHON_BINDING_NAMESPACE "${PYTHON_BINDING_NAMESPACE}Qt${PYSIDE_MAJOR_VERSION}")
-  set(QtWidgets_VERSION ${Qt6Widgets_VERSION})
+    set(PYSIDE_MAJOR_VERSION "6")
+    set(PYTHON_BINDING_NAMESPACE "${PYTHON_BINDING_NAMESPACE}Qt${PYSIDE_MAJOR_VERSION}")
+    set(QtWidgets_VERSION ${Qt6Widgets_VERSION})
 else()
-  set(PYSIDE_MAJOR_VERSION "2")
-  set(QtWidgets_VERSION ${Qt5Widgets_VERSION})
+    set(PYSIDE_MAJOR_VERSION "2")
+    set(QtWidgets_VERSION ${Qt5Widgets_VERSION})
 endif()
 
 find_package(Python3 3.7 REQUIRED COMPONENTS Interpreter Development)
@@ -32,13 +32,14 @@ find_package(Shiboken${PYSIDE_MAJOR_VERSION} REQUIRED)
 find_package(PySide${PYSIDE_MAJOR_VERSION} ${QtWidgets_VERSION} EXACT REQUIRED)
 
 if(NOT ${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX)
-  set(${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+    set(${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 endif()
-set(BINDINGS_DIR "${INSTALL_LIBRARY_DIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/${PYTHON_BINDING_NAMESPACE}")
+set(Python3_VERSION_MAJORMINOR "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}")
+set(BINDINGS_DIR "${INSTALL_LIBRARY_DIR}/python${Python3_VERSION_MAJORMINOR}/site-packages/${PYTHON_BINDING_NAMESPACE}")
 set(${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX "${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}/${BINDINGS_DIR}")
 
 include(PySide${PYSIDE_MAJOR_VERSION}ModuleBuild)
 add_subdirectory(PyKDDockWidgets)
 if(${PROJECT_NAME}_TESTS)
-  add_subdirectory(tests)
+    add_subdirectory(tests)
 endif()

python/PyKDDockWidgets/CMakeLists.txt

@@ -35,65 +35,47 @@ set(PyKDDockWidgets_include_paths
 )
 
 # A list of paths where shiboken should look for typesystem
-set(PyKDDockWidgets_typesystem_paths
-    # PySide path, this variable was exposed by FindPySide2.cmake
+set(PyKDDockWidgets_typesystem_paths # PySide path, this variable was exposed by FindPySide2.cmake
     ${PYSIDE_TYPESYSTEMS}
 )
 
 # Include flags/path that will be set in 'target_include_directories'
-set(PyKDDockWidgets_target_include_directories
-    ${CMAKE_SOURCE_DIR}/src
-)
+set(PyKDDockWidgets_target_include_directories ${CMAKE_SOURCE_DIR}/src)
 
 # Libraries that will be necessary to link the target, this will used in the command 'target_link_libraries'
-set(PyKDDockWidgets_target_link_libraries
-    KDAB::kddockwidgets
-    Qt${Qt_VERSION_MAJOR}::Core
-    Qt${Qt_VERSION_MAJOR}::Gui
-    Qt${Qt_VERSION_MAJOR}::Widgets
-    ${Python3_LIBRARIES}
+set(PyKDDockWidgets_target_link_libraries KDAB::kddockwidgets Qt${Qt_VERSION_MAJOR}::Core Qt${Qt_VERSION_MAJOR}::Gui
+                                          Qt${Qt_VERSION_MAJOR}::Widgets ${Python3_LIBRARIES}
 )
 
 # changes on these files should trigger a new generation
 set(PyKDDockWidgets_DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidgets_global.h
-    ${CMAKE_SOURCE_DIR}/src/DockWidgetBase.h
-    ${CMAKE_SOURCE_DIR}/src/DockWidget.h
-    ${CMAKE_SOURCE_DIR}/src/MainWindowBase.h
-    ${CMAKE_SOURCE_DIR}/src/MainWindow.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidgets_global.h ${CMAKE_SOURCE_DIR}/src/DockWidgetBase.h
+    ${CMAKE_SOURCE_DIR}/src/DockWidget.h ${CMAKE_SOURCE_DIR}/src/MainWindowBase.h ${CMAKE_SOURCE_DIR}/src/MainWindow.h
     ${CMAKE_SOURCE_DIR}/src/LayoutSaver.h
 )
 
 create_python_bindings(
-  "KDDockWidgets"
-  "${PyKDDockWidgets_typesystem_paths}"
-  "${PyKDDockWidgets_include_paths}"
-  "${PyKDDockWidgets_SRC}"
-  "${PyKDDockWidgets_target_include_directories}"
-  "${PyKDDockWidgets_target_link_libraries}"
-  ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidgets_global.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_kddockwidgets.xml
-  "${PyKDDockWidgets_DEPENDS}"
-  ${CMAKE_CURRENT_BINARY_DIR}
+    "KDDockWidgets"
+    "${PyKDDockWidgets_typesystem_paths}"
+    "${PyKDDockWidgets_include_paths}"
+    "${PyKDDockWidgets_SRC}"
+    "${PyKDDockWidgets_target_include_directories}"
+    "${PyKDDockWidgets_target_link_libraries}"
+    ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidgets_global.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_kddockwidgets.xml
+    "${PyKDDockWidgets_DEPENDS}"
+    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 # Make module import from build dir work
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.cmake ${CMAKE_CURRENT_BINARY_DIR}/__init__.py @ONLY)
 
 # install
-install(
-  FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/__init__.py
-    $<TARGET_FILE:KDAB::kddockwidgets>
-  DESTINATION
-    ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/__init__.py $<TARGET_FILE:KDAB::kddockwidgets>
+        DESTINATION ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}
 )
 if(NOT WIN32)
-  install(
-    FILES
-        $<TARGET_LINKER_FILE:KDAB::kddockwidgets>
-        $<TARGET_SONAME_FILE:KDAB::kddockwidgets>
-    DESTINATION
-        ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}
-  )
+    install(FILES $<TARGET_LINKER_FILE:KDAB::kddockwidgets> $<TARGET_SONAME_FILE:KDAB::kddockwidgets>
+            DESTINATION ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}
+    )
 endif()

python/tests/CMakeLists.txt

@@ -11,30 +11,26 @@
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.py.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.py @ONLY)
 
-set(TEST_PYTHONPATH
-    ${CMAKE_BINARY_DIR}/python
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
+set(TEST_PYTHONPATH ${CMAKE_BINARY_DIR}/python ${CMAKE_CURRENT_BINARY_DIR})
 set(TEST_LIBRARYPATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
 if(WIN32)
-  set(TEST_LIBRARY_VAR "PATH")
-  string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}")
-  string(REPLACE "\\" "/" TEST_LIBRARYPATH "${TEST_LIBRARYPATH}")
-  list(JOIN TEST_PYTHONPATH "\\;" TEST_PYTHONPATH)
-  list(JOIN TEST_LIBRARYPATH "\\;" TEST_LIBRARYPATH)
+    set(TEST_LIBRARY_VAR "PATH")
+    string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}")
+    string(REPLACE "\\" "/" TEST_LIBRARYPATH "${TEST_LIBRARYPATH}")
+    list(JOIN TEST_PYTHONPATH "\\;" TEST_PYTHONPATH)
+    list(JOIN TEST_LIBRARYPATH "\\;" TEST_LIBRARYPATH)
 else()
-  set(TEST_LIBRARY_VAR "LD_LIBRARY_PATH")
-  list(JOIN TEST_PYTHONPATH ":" TEST_PYTHONPATH)
-  list(JOIN TEST_LIBRARYPATH ":" TEST_LIBRARYPATH)
+    set(TEST_LIBRARY_VAR "LD_LIBRARY_PATH")
+    list(JOIN TEST_PYTHONPATH ":" TEST_PYTHONPATH)
+    list(JOIN TEST_LIBRARYPATH ":" TEST_LIBRARYPATH)
 endif()
 
 set(PYTHON_ENV_COMMON "PYTHONPATH=${TEST_PYTHONPATH};${TEST_LIBRARY_VAR}=${TEST_LIBRARYPATH}")
 
 file(GLOB TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tst_*.py)
 foreach(test_file ${TEST_FILES})
-  get_filename_component(test_name ${test_file} NAME_WE)
-  add_test(${test_name} ${Python3_EXECUTABLE} ${test_file})
-  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "${PYTHON_ENV_COMMON}")
+    get_filename_component(test_name ${test_file} NAME_WE)
+    add_test(${test_name} ${Python3_EXECUTABLE} ${test_file})
+    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "${PYTHON_ENV_COMMON}")
 endforeach()
-