Added check on windows for Qt6. if not installed, adds external Qt pa…

…th to cmake and tries again.
aldelaro5 · Jul 7, 2024 · 15e3d2c · 15e3d2c
1 parent 7e44498
commit 15e3d2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -48,7 +48,17 @@ set(SRCS ${DolphinProcessSrc}
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(Qt6Widgets REQUIRED)
+if (WIN32)
+    find_package(Qt6Widgets QUIET)
+	  if (NOT Qt6Widgets_FOUND)
+		    message(STATUS "Qt package not found, using external lib")
+		    list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}\\..\\Externals\\Qt\\Qt6.5.3\\x64")
+		    find_package(Qt6Widgets REQUIRED)
+	  endif ()
+else ()
+	  find_package(Qt6Widgets REQUIRED)
+endif ()
+
 find_package(Qt6Core REQUIRED)
 find_package(Qt6Gui REQUIRED)
 if (NOT APPLE)

diff --git a/Source/dolphin-memory-engine.vcxproj b/Source/dolphin-memory-engine.vcxproj
@@ -126,7 +126,6 @@
     <ClCompile Include="GeneratedFiles\$(Configuration)\moc_MemWatchModel.cpp" />
     <ClCompile Include="GeneratedFiles\$(Configuration)\moc_MemWatchWidget.cpp" />
     <ClCompile Include="GeneratedFiles\$(Configuration)\moc_ResultsListModel.cpp" />
-    <ClCompile Include="GeneratedFiles\$(Configuration)\moc_AddressInputWidget.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="**\*.h" Exclude="GUI\**\*.h" />