diff --git a/MobileGL/MG_Test/CMakeLists.txt b/MobileGL/MG_Test/CMakeLists.txt
index aa8cb0ba..427e0acc 100644
--- a/MobileGL/MG_Test/CMakeLists.txt
+++ b/MobileGL/MG_Test/CMakeLists.txt
@@ -23,8 +23,8 @@ set(MGL_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..)
 
 # Find the required libraries using our custom Find modules
 find_package(glslang REQUIRED)
-find_package(SPIRVTools REQUIRED)
 find_package(SPIRVCross REQUIRED)
+find_package(SPIRVTools)
 
 add_executable(
   SanityTest
@@ -42,10 +42,13 @@ message(STATUS "SPIRVCross_LIBRARIES: ${SPIRVCross_LIBRARIES}")
 # Set the libraries to link against
 set(LINK_LIBRARIES 
     ${glslang_LIBRARIES}
-    ${SPIRVTools_LIBRARIES}
     ${SPIRVCross_LIBRARIES}
 )
 
+if (SPIRVTools_FOUND)
+  list(APPEND LINK_LIBRARIES ${SPIRVTools_LIBRARIES})
+endif()
+
 include(GoogleTest)
 gtest_discover_tests(SanityTest)
 
diff --git a/buildsystem/cmake/FindSPIRVCross.cmake b/buildsystem/cmake/FindSPIRVCross.cmake
index b852ba12..1425e5de 100644
--- a/buildsystem/cmake/FindSPIRVCross.cmake
+++ b/buildsystem/cmake/FindSPIRVCross.cmake
@@ -35,9 +35,6 @@ if (NOT SPIRVCross_FOUND)
             spirv-cross-c
         )
         
-        # Set the include directories
-        set(SPIRVCross_INCLUDE_DIRS ${spirv_cross_core_INCLUDE_DIRS})
-        
         # Mark as found
         set(SPIRVCross_FOUND TRUE)
     endif()
@@ -288,10 +285,17 @@ endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SPIRVCross 
-    REQUIRED_VARS SPIRVCross_INCLUDE_DIR SPIRVCross_LIBRARIES
+    REQUIRED_VARS SPIRVCross_LIBRARIES
 )
 
 mark_as_advanced(
     SPIRVCross_INCLUDE_DIR
-    SPIRVCross_LIBRARIES
+    SPIRVCross_LIBRARY
+    SPIRVCross_c_LIBRARY
+    SPIRVCross_cpp_LIBRARY
+    SPIRVCross_core_LIBRARY
+    SPIRVCross_reflect_LIBRARY
+    SPIRVCross_glsl_LIBRARY
+    SPIRVCross_hlsl_LIBRARY
+    SPIRVCross_msl_LIBRARY
 )
\ No newline at end of file
diff --git a/buildsystem/cmake/FindSPIRVTools.cmake b/buildsystem/cmake/FindSPIRVTools.cmake
index bc7b65fc..1fae50c2 100644
--- a/buildsystem/cmake/FindSPIRVTools.cmake
+++ b/buildsystem/cmake/FindSPIRVTools.cmake
@@ -142,7 +142,7 @@ set(SPIRVTools_LIBRARIES
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SPIRVTools 
-    REQUIRED_VARS SPIRVTools_INCLUDE_DIR SPIRVTools_LIBRARY
+    REQUIRED_VARS SPIRVTools_LIBRARY
 )
 
 mark_as_advanced(
diff --git a/buildsystem/cmake/Findglslang.cmake b/buildsystem/cmake/Findglslang.cmake
index 736ec92f..7880b03b 100644
--- a/buildsystem/cmake/Findglslang.cmake
+++ b/buildsystem/cmake/Findglslang.cmake
@@ -16,8 +16,7 @@ if (NOT glslang_FOUND)
     find_package(glslang CONFIG QUIET)
     if (glslang_FOUND)
         message(STATUS "Found glslang via CONFIG mode: ${glslang_DIR}")
-        set(glslang_INCLUDE_DIRS ${glslang_INCLUDE_DIRS} ${glslang_INCLUDE_DIR})
-        set(glslang_LIBRARIES ${glslang_LIBRARIES} ${glslang_LIBRARY})
+        set(glslang_LIBRARY glslang::glslang)
     endif()
 endif()
 
@@ -223,7 +222,7 @@ set(glslang_LIBRARIES
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(glslang 
-    REQUIRED_VARS glslang_INCLUDE_DIR glslang_LIBRARY
+    REQUIRED_VARS glslang_LIBRARIES
 )
 
 mark_as_advanced(