Merge pull request #39 from nohal/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: nohal

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.6
+    rev: v21.1.7
     hooks:
       - id: clang-format
         exclude: |
@@ -33,7 +33,7 @@ repos:
     hooks:
     - id: cmake-format
   - repo: https://github.com/oxipng/oxipng
-    rev: v9.1.5
+    rev: v10.0.0
     hooks:
       - id: oxipng
   - repo: https://github.com/kytta/mirrors-svgo

Plugin.cmake

@@ -90,23 +90,23 @@ macro(add_plugin_libraries)
     add_subdirectory(opencpn-libs/marnav)
     target_link_libraries(${PACKAGE_NAME} ocpn::marnav)
   else(APPLE)
-  find_path(MARNAV_HEADER marnav)
-  find_library(MARNAV_LIB libmarnav.a marnav)
-  if("${MARNAV_HEADER}" MATCHES ".*-NOTFOUND" OR MARNAV_LIB MATCHES
-                                                 ".*-NOTFOUND")
-    message(STATUS "Pulling in marnav")
-    add_subdirectory("${CMAKE_SOURCE_DIR}/libs/marnav")
-    target_link_libraries(${PACKAGE_NAME} ocpn::marnav)
-    if(${WITH_TESTS})
-      include(CTest)
-      add_subdirectory("${CMAKE_SOURCE_DIR}/tests")
-      add_dependencies(${CMAKE_PROJECT_NAME} tests)
+    find_path(MARNAV_HEADER marnav)
+    find_library(MARNAV_LIB libmarnav.a marnav)
+    if("${MARNAV_HEADER}" MATCHES ".*-NOTFOUND" OR MARNAV_LIB MATCHES
+                                                   ".*-NOTFOUND")
+      message(STATUS "Pulling in marnav")
+      add_subdirectory("${CMAKE_SOURCE_DIR}/libs/marnav")
+      target_link_libraries(${PACKAGE_NAME} ocpn::marnav)
+      if(${WITH_TESTS})
+        include(CTest)
+        add_subdirectory("${CMAKE_SOURCE_DIR}/tests")
+        add_dependencies(${CMAKE_PROJECT_NAME} tests)
+      endif()
+    else()
+      message(STATUS "Using marnav from ${MARNAV_HEADER} ${MARNAV_LIB}")
+      target_include_directories(${PACKAGE_NAME} PUBLIC ${MARNAV_HEADER})
+      target_link_libraries(${PACKAGE_NAME} ${MARNAV_LIB})
     endif()
-  else()
-    message(STATUS "Using marnav from ${MARNAV_HEADER} ${MARNAV_LIB}")
-    target_include_directories(${PACKAGE_NAME} PUBLIC ${MARNAV_HEADER})
-    target_link_libraries(${PACKAGE_NAME} ${MARNAV_LIB})
-  endif()
   endif()
 endmacro()