refs modelica#4093 Run cmake-lint --linelength=100

beutlich · Mar 28, 2024 · f6f3895 · f6f3895
1 parent 17742e5
commit f6f3895
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 16 deletions.
diff --git a/Modelica/Resources/BuildProjects/CMake/CMakeLists.txt b/Modelica/Resources/BuildProjects/CMake/CMakeLists.txt
@@ -14,10 +14,18 @@ include(Modelica_utilities.cmake)
 
 set(MODELICA_RESOURCES_DIR "${PROJECT_SOURCE_DIR}/../..")
 get_filename_component(ABSOLUTE_MODELICA_RESOURCES_DIR "${MODELICA_RESOURCES_DIR}" ABSOLUTE)
-set(CMAKE_INSTALL_PREFIX "${ABSOLUTE_MODELICA_RESOURCES_DIR}" CACHE PATH "Library installation prefix path (don't change)" FORCE)
+set(
+  CMAKE_INSTALL_PREFIX "${ABSOLUTE_MODELICA_RESOURCES_DIR}"
+  CACHE PATH
+  "Library installation prefix path (don't change)" FORCE
+)
 
 get_modelica_platform_name_with_compiler_version(MODELICA_PLATFORM_NAME)
-set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/Library/${MODELICA_PLATFORM_NAME}" CACHE PATH "Library installation path (don't change)" FORCE)
+set(
+  CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/Library/${MODELICA_PLATFORM_NAME}"
+  CACHE PATH
+  "Library installation path (don't change)" FORCE
+)
 
 include(compiler_options.cmake)
 include(options.cmake)

diff --git a/Modelica/Resources/BuildProjects/CMake/Modelica_platform.cmake b/Modelica/Resources/BuildProjects/CMake/Modelica_platform.cmake
@@ -6,24 +6,30 @@ function(get_modelica_platform_name var)
   endif()
   if(APPLE)
     list(LENGTH CMAKE_OSX_ARCHITECTURES NUMBER_OF_OSX_ARCHITECTURES)
-    if (NUMBER_OF_OSX_ARCHITECTURES EQUAL 0)
-      if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    if(NUMBER_OF_OSX_ARCHITECTURES EQUAL 0)
+      if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
         set(PLATFORM_PATH_SUFFIX "darwin64")
-      elseif (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+      elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
         set(PLATFORM_PATH_SUFFIX "aarch64-darwin")
       else()
-        message(FATAL_ERROR "Unknown macOS architecture CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR}.")
+        message(FATAL_ERROR
+          "Unknown macOS architecture CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR}."
+        )
       endif()
     elseif(NUMBER_OF_OSX_ARCHITECTURES EQUAL 1)
-      if (CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
+      if(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
         set(PLATFORM_PATH_SUFFIX "darwin64")
-      elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+      elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
         set(PLATFORM_PATH_SUFFIX "aarch64-darwin")
       else()
-        message(FATAL_ERROR "Unknown macOS architecture CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}.")
+        message(FATAL_ERROR
+          "Unknown macOS architecture CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}."
+        )
       endif()
     else()
-      message(FATAL_ERROR "Universal builds not supported CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}.")
+      message(FATAL_ERROR
+        "Universal builds not supported CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}."
+      )
     endif()
   elseif(UNIX)
     if(IS_64BIT_BUILD)

diff --git a/Modelica/Resources/BuildProjects/CMake/Modelica_utilities.cmake b/Modelica/Resources/BuildProjects/CMake/Modelica_utilities.cmake
@@ -6,7 +6,11 @@ if(DEFINED MODELICA_UTILITIES_INCLUDE_DIR)
     message(FATAL_ERROR "MODELICA_UTILITIES_INCLUDE_DIR is an empty string.")
   endif()
 else()
-  set(MODELICA_UTILITIES_INCLUDE_DIR "" CACHE PATH "Include directory of the (tool-vendor specific) ModelicaUtilities.h header file")
+  set(
+    MODELICA_UTILITIES_INCLUDE_DIR ""
+    CACHE PATH
+    "Include directory of the (tool-vendor specific) ModelicaUtilities.h header file"
+  )
   if(NOT MODELICA_UTILITIES_INCLUDE_DIR STREQUAL "")
     file(TO_CMAKE_PATH ${MODELICA_UTILITIES_INCLUDE_DIR} MODELICA_UTILITIES_INCLUDE_DIR)
     include_directories(${MODELICA_UTILITIES_INCLUDE_DIR})

diff --git a/Modelica/Resources/BuildProjects/CMake/compiler_options.cmake b/Modelica/Resources/BuildProjects/CMake/compiler_options.cmake
@@ -24,7 +24,7 @@ check_c_source_compiles(
   "
   HAVE_ATTRIBUTE_VISIBILITY_HIDDEN
 )
-if (HAVE_UNISTD_H)
+if(HAVE_UNISTD_H)
   check_c_source_compiles(
     "
       #include <unistd.h>

diff --git a/Modelica/Resources/BuildProjects/CMake/options.cmake b/Modelica/Resources/BuildProjects/CMake/options.cmake
@@ -2,7 +2,10 @@
 option(MODELICA_DEBUG_TIME_EVENTS "Trace time events of CombiTimeTable" OFF)
 
 # Option to share table arrays
-option(MODELICA_SHARE_TABLE_DATA "Store shared table arrays (read from file) in a global hash table" ON)
+option(
+  MODELICA_SHARE_TABLE_DATA
+  "Store shared table arrays (read from file) in a global hash table" ON
+)
 
 # Option to deep-copy table arrays
 option(MODELICA_COPY_TABLE_DATA "Deep-copy table arrays (passed as array)" ON)
@@ -11,7 +14,10 @@ option(MODELICA_COPY_TABLE_DATA "Deep-copy table arrays (passed as array)" ON)
 option(MODELICA_DUMMY_FUNCTION_USERTAB "Add a dummy usertab function" OFF)
 
 # Option to build zlib from sources
-option(MODELICA_BUILD_ZLIB "Build zlib from sources in this project, otherwise provide ZLIB_INCLUDE_DIR" ON)
+option(
+  MODELICA_BUILD_ZLIB
+  "Build zlib from sources in this project, otherwise provide ZLIB_INCLUDE_DIR" ON
+)
 
 # Option whether to install ModelicaExternalC
 option(MODELICA_INSTALL_EXTC "Install ModelicaExternalC library" OFF)
diff --git a/Modelica/Resources/BuildProjects/CMake/test.cmake b/Modelica/Resources/BuildProjects/CMake/test.cmake
@@ -16,7 +16,12 @@ if(BUILD_TESTING)
     )
     foreach(TEST ${MODELICA_TESTS})
       add_executable(Test${TEST} "${ABSOLUTE_MODELICA_TEST_SOURCE_DIR}/${TEST}.c")
-      target_link_libraries(Test${TEST} ModelicaExternalC ModelicaStandardTables ModelicaIO ModelicaMatIO)
+      target_link_libraries(Test${TEST}
+        ModelicaExternalC
+        ModelicaStandardTables
+        ModelicaIO
+        ModelicaMatIO
+      )
       if(MODELICA_BUILD_ZLIB)
         target_link_libraries(Test${TEST} zlib)
       else()
@@ -25,7 +30,11 @@ if(BUILD_TESTING)
       if(UNIX)
         target_link_libraries(Test${TEST} m)
       endif()
-      add_test(NAME Test${TEST} COMMAND Test${TEST} WORKING_DIRECTORY "${ABSOLUTE_MODELICA_TEST_SOURCE_DIR}")
+      add_test(
+        NAME Test${TEST}
+        COMMAND Test${TEST}
+        WORKING_DIRECTORY "${ABSOLUTE_MODELICA_TEST_SOURCE_DIR}"
+      )
     endforeach()
   else()
     message(WARNING