classes/cmake added sysroot to find_root_paths

Author: mahaase

classes/cmake.yaml

@@ -11,6 +11,9 @@ buildScript: |
         [[ "$AUTOCONF_BUILD" == *-msys ]] && i="$(cygpath -m $i)"
         CMAKE_FIND_ROOT_PATH+="${CMAKE_FIND_ROOT_PATH:+;}$i"
     done
+    # We should also add the sysroot path if available.
+    SYSROOT="$($CXX -print-sysroot)"
+    [ -z "${SYSROOT:+true}" ] || CMAKE_FIND_ROOT_PATH+=";${SYSROOT}"
 
     # This looks odd but it prevents MSYS from converting /usr to C:\msys64\usr
     # (or wherever MSYS was installed). See
@@ -115,6 +118,7 @@ buildScript: |
             -DCMAKE_BUILD_TYPE=Bob \
             -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
             -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
+            -DCMAKE_INSTALL_LIBDIR="lib" \
             -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
             -DCMAKE_MSVC_RUNTIME_LIBRARY="" \
             "${@:2}"