diff --git a/CMakeLists.txt b/CMakeLists.txt
index c556fdf..87163ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,20 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 if(APPLE)
-  link_directories(/usr/local/lib /usr/local/opt/gettext/lib /usr/local/opt/libsigc++@2/lib)
+  # Added if expressions to avoid linking warnings:
+  if(EXISTS /usr/local/lib)
+    link_directories(/usr/local/lib)
+  endif()
+  if(EXISTS /usr/local/opt/gettext/lib)
+    link_directories(/usr/local/opt/gettext/lib)
+  endif()
+  if(EXISTS /usr/local/opt/libsigc++@2/lib)
+    link_directories(/usr/local/opt/libsigc++@2/lib)
+  endif()
+  if(EXISTS /opt/homebrew/lib)
+    link_directories(/opt/homebrew/lib)
+  endif()
+
   include_directories(/usr/local/opt/gettext/include)
   set(CMAKE_MACOSX_RPATH 1)
   set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/libsigc++@2/lib/pkgconfig:/usr/local/opt/zlib/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig")
diff --git a/lib/libclangmm b/lib/libclangmm
index 1cdedf7..1b48e1f 160000
--- a/lib/libclangmm
+++ b/lib/libclangmm
@@ -1 +1 @@
-Subproject commit 1cdedf78937e659860e38d1cc51b182a30d24012
+Subproject commit 1b48e1f4bd4f4ad2a6cb0102ac01dbf78c9efe57