fix clang format

JRL-CARI-CNR-UNIBS · Jan 20, 2025 · 9e598e0 · 9e598e0
1 parent ed5f7ab
commit 9e598e0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/graph_core/.clang-format b/graph_core/.clang-format
@@ -50,15 +50,14 @@ SpaceAfterCStyleCast: false
 BreakBeforeBraces: Custom
 
 # Control of individual brace wrapping cases
-BraceWrapping: {
-    AfterClass: 'true'
-    AfterControlStatement: 'true'
-    AfterEnum : 'true'
-    AfterFunction : 'true'
-    AfterNamespace : 'true'
-    AfterStruct : 'true'
-    AfterUnion : 'true'
-    BeforeCatch : 'true'
-    BeforeElse : 'true'
-    IndentBraces : 'false'
-}
+BraceWrapping:
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
diff --git a/graph_core/cmake_config/clang_format_target.sh b/graph_core/cmake_config/clang_format_target.sh
@@ -3,7 +3,7 @@
 # Directory base del progetto (una directory sopra lo script)
 PROJECT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 
-echo "Checking for clang-format..."
+echo "Checking for clang-format in $PROJECT_DIR..."
 
 if ! command -v clang-format > /dev/null 2>&1; then
     echo "clang-format not found, skipping format target"

diff --git a/graph_core/cmake_config/graph_coreConfig.cmake.in b/graph_core/cmake_config/graph_coreConfig.cmake.in
@@ -8,13 +8,7 @@ find_dependency(cnr_param REQUIRED)
 find_dependency(cnr_logger REQUIRED)
 find_dependency(cnr_class_loader REQUIRED)
 
-if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/graph_coreTargets.cmake")
-  include("${CMAKE_CURRENT_LIST_DIR}/graph_coreTargets.cmake")
-elseif(EXISTS "@CMAKE_INSTALL_PREFIX@/share/graph_core/cmake/graph_coreTargets.cmake")
-  include("@CMAKE_INSTALL_PREFIX@/share/graph_core/cmake/graph_coreTargets.cmake")
-else()
-  message(FATAL_ERROR "graph_coreTargets.cmake not found!")
-endif()
+include("@CMAKE_INSTALL_PREFIX@/share/graph_core/cmake/graph_coreTargets.cmake")
 
 set_and_check(@PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@" ${Eigen3_INCLUDE_DIRS} ${cnr_param_INCLUDE_DIRS} ${cnr_logger_INCLUDE_DIRS} ${cnr_class_loader_INCLUDE_DIRS})
 set(@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@ ${Eigen3_LIBRARIES} ${cnr_param_LIBRARIES} ${cnr_logger_LIBRARIES} ${cnr_class_loader_LIBRARIES})