formatting

Author: Klaim

.github/workflows/windows_impl.yml

@@ -101,7 +101,6 @@ jobs:
           unset CONDARC  # Interferes with tests
           cd ./build/libmamba && ./tests/test_libmamba
 
-
   libmambapy_tests_win:
     name: libmambapy tests
     needs: ["build_shared_win"]

CMakeLists.txt

@@ -80,8 +80,6 @@ if(BUILD_LIBMAMBA)
     add_subdirectory(libmamba-spdlog)
 endif()
 
-
-
 # Python bindings of libmamba
 if(BUILD_LIBMAMBAPY)
     add_subdirectory(libmambapy)

cmake/CompilerWarnings.cmake

@@ -155,7 +155,7 @@ function(mamba_target_add_compile_warnings target)
     endif()
 
     get_target_property(type ${target} TYPE)
-    if (NOT ${type} STREQUAL "INTERFACE_LIBRARY")
+    if(NOT ${type} STREQUAL "INTERFACE_LIBRARY")
         target_compile_options("${target}" PRIVATE ${warnings})
     endif()
 

dev/CMakePresetsMamba.json

@@ -5,7 +5,7 @@
         "BUILD_LIBMAMBA": "ON",
         "BUILD_LIBMAMBAPY": "ON",
         "BUILD_LIBMAMBA_TESTS": "ON",
-        "BUILD_LIBMAMBA_SPDLOG_TESTS" : "ON",
+        "BUILD_LIBMAMBA_SPDLOG_TESTS": "ON",
         "BUILD_MAMBA_PACKAGE": "ON"
       },
       "description": "Base profile for building libmamba and related",

libmamba-spdlog/CMakeLists.txt

@@ -20,40 +20,31 @@ find_package(spdlog CONFIG REQUIRED)
 find_package(Threads REQUIRED)
 
 # For some reasons, using target_compile_definitions does not set the definitions properly
-add_compile_definitions(
-    SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}"
-)
+add_compile_definitions(SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}")
 
 add_library(libmamba-spdlog INTERFACE)
-# target_sources(libmamba-spdlog
-#     INTERFACE
-#         include/mamba/spdlog/logging_spdlog.hpp
-#         include/mamba/spdlog/logging_spdlog_impl.hpp
-# )
+# target_sources(libmamba-spdlog INTERFACE include/mamba/spdlog/logging_spdlog.hpp
+# include/mamba/spdlog/logging_spdlog_impl.hpp )
 add_library(mamba::libmamba-spdlog ALIAS libmamba-spdlog)
 
-target_include_directories(libmamba-spdlog INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+target_include_directories(
+    libmamba-spdlog
+    INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>
 )
 
-
-target_link_libraries(libmamba-spdlog
+target_link_libraries(
+    libmamba-spdlog
     INTERFACE
         ${libmamba_target}
-
-        # Since conda-forge spdlog is built with a bundled version of fmt we use the header
-        # only version to avoid chasing after the correct fmt version matching the one used
-        # in the bundle.
+        # Since conda-forge spdlog is built with a bundled version of fmt we use the header only
+        # version to avoid chasing after the correct fmt version matching the one used in the
+        # bundle.
         spdlog::spdlog_header_only
-
-        # We need the threading facilities available whatever the user use.
-        # This should have been part of depending on spdlog but for some reason it's
-        # not made available automatically.
+        # We need the threading facilities available whatever the user use. This should have been
+        # part of depending on spdlog but for some reason it's not made available automatically.
         Threads::Threads
 )
 
-
 mamba_target_add_compile_warnings(libmamba-spdlog WARNING_AS_ERROR ${MAMBA_WARNING_AS_ERROR})
 
 target_compile_features(libmamba-spdlog INTERFACE cxx_std_20)
@@ -71,7 +62,8 @@ write_basic_package_version_file(
     VERSION 1.0
     COMPATIBILITY AnyNewerVersion
 )
-install(TARGETS libmamba-spdlog
+install(
+    TARGETS libmamba-spdlog
     EXPORT ${PROJECT_NAME}Targets
     LIBRARY DESTINATION lib COMPONENT Runtime
     ARCHIVE DESTINATION lib COMPONENT Development
@@ -85,17 +77,20 @@ configure_package_config_file(
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
-install(EXPORT ${PROJECT_NAME}Targets
+install(
+    EXPORT ${PROJECT_NAME}Targets
     NAMESPACE mamba::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
 
-install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Version.cmake"
-              "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+install(
+    FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Version.cmake"
+          "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
 
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include)
 
 if(BUILD_LIBMAMBA_SPDLOG_TESTS)
     add_subdirectory(tests/)
 endif()
-

libmamba-spdlog/tests/CMakeLists.txt

@@ -3,9 +3,10 @@ cmake_minimum_required(VERSION 3.16)
 find_package(Catch2 REQUIRED)
 find_package(Threads REQUIRED)
 
-add_executable( test_libmamba_logging_spdlog test_logging_spdlog.cpp )
+add_executable(test_libmamba_logging_spdlog test_logging_spdlog.cpp)
 
-target_link_libraries(test_libmamba_logging_spdlog
+target_link_libraries(
+    test_libmamba_logging_spdlog
     PUBLIC
         mamba::libmamba
         mamba::libmamba-spdlog
@@ -23,7 +24,9 @@ set_target_properties(
         CXX_EXTENSIONS NO
 )
 
-mamba_target_add_compile_warnings(test_libmamba_logging_spdlog WARNING_AS_ERROR ${MAMBA_WARNING_AS_ERROR})
+mamba_target_add_compile_warnings(
+    test_libmamba_logging_spdlog WARNING_AS_ERROR ${MAMBA_WARNING_AS_ERROR}
+)
 
 # ##################################################################################################
 

libmamba-spdlog/tests/test_logging_spdlog.cpp

@@ -12,7 +12,6 @@
 #include <fmt/core.h>
 
 #include <mamba/spdlog/logging_spdlog.hpp>
-
 #include <mamba/testing/test_logging_common.hpp>
 
 namespace mamba::logging

libmamba/CMakeLists.txt

@@ -621,11 +621,7 @@ macro(libmamba_create_target target_name linkage output_name)
 
         target_link_libraries(
             ${target_name}
-            PUBLIC
-                ${LIBSOLV_LIBRARIES}
-                ${LIBSOLVEXT_LIBRARIES}
-                yaml-cpp::yaml-cpp
-                fmt::fmt                
+            PUBLIC ${LIBSOLV_LIBRARIES} ${LIBSOLVEXT_LIBRARIES} yaml-cpp::yaml-cpp fmt::fmt
             PRIVATE
                 ${LibArchive_LIBRARIES}
                 ${CURL_LIBRARIES}

libmamba/tests/CMakeLists.txt

@@ -167,11 +167,11 @@ set_target_properties(
 # libmamba logging system tests
 
 add_library(libtesting_mamba_logging_common INTERFACE)
-target_sources(libtesting_mamba_logging_common
-    INTERFACE
-        libmamba_logging/include/mamba/testing/test_logging_common.hpp
+target_sources(
+    libtesting_mamba_logging_common
+    INTERFACE libmamba_logging/include/mamba/testing/test_logging_common.hpp
 )
-target_include_directories(libtesting_mamba_logging_common INTERFACE libmamba_logging/include/ )
+target_include_directories(libtesting_mamba_logging_common INTERFACE libmamba_logging/include/)
 
 add_library(mamba::libtesting_mamba_logging_common ALIAS libtesting_mamba_logging_common)
 
@@ -182,7 +182,8 @@ add_executable(
     libmamba_logging/test_logging_anyloghandler.cpp
 )
 
-target_link_libraries(test_libmamba_logging
+target_link_libraries(
+    test_libmamba_logging
     PRIVATE
         mamba::libmamba
         Catch2::Catch2WithMain

libmamba/tests/libmamba_logging/test_logging_anyloghandler.cpp

@@ -11,9 +11,8 @@
 #include <catch2/catch_all.hpp>
 
 #include <mamba/core/logging.hpp>
-#include <mamba/util/synchronized_value.hpp>
-
 #include <mamba/testing/test_logging_common.hpp>
+#include <mamba/util/synchronized_value.hpp>
 
 namespace mamba::logging
 {