diff --git a/src/lib/cmake/FindAccountsFileDir.cmake b/src/lib/cmake/FindAccountsFileDir.cmake
index 08a0463..11195ea 100644
--- a/src/lib/cmake/FindAccountsFileDir.cmake
+++ b/src/lib/cmake/FindAccountsFileDir.cmake
@@ -1,46 +1,46 @@
 find_package(PkgConfig REQUIRED)
 
 execute_process(
     COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=prefix libaccounts-glib
     OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed)
+    RESULT_VARIABLE _pkgconfig_failed
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE)
 
 if (_pkgconfig_failed)
-    message(FAILED "Couldn't find the prefix for libaccounts-glib")
+    message(FATAL_ERROR "Couldn't find the prefix for libaccounts-glib")
 else()
-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
     set(ACCOUNTS_PREFIX_DIR ${_pkgconfig_invoke_result})
 endif()
 
 execute_process(
     COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=providerfilesdir libaccounts-glib
     OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed)
+    RESULT_VARIABLE _pkgconfig_failed
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE)
 
 if (_pkgconfig_failed)
-    message(FAILED "Couldn't find the providerfilesdir for libaccounts-glib")
+    message(FATAL_ERROR "Couldn't find the providerfilesdir for libaccounts-glib")
 else()
-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
     if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
         string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
     endif()
     set(ACCOUNTS_PROVIDERS_DIR ${_pkgconfig_invoke_result})
 endif()
 
 execute_process(
     COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=servicefilesdir libaccounts-glib
     OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed)
+    RESULT_VARIABLE _pkgconfig_failed
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE)
 
 if (_pkgconfig_failed)
-    message(FAILED "Couldn't find the servicefilesdir for libaccounts-glib")
+    message(FATAL_ERROR "Couldn't find the servicefilesdir for libaccounts-glib")
 else()
-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
     if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
         string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
     endif()
     set(ACCOUNTS_SERVICES_DIR ${_pkgconfig_invoke_result})
 endif()