Change qt

ManiVaultStudio · Sep 23, 2024 · 1efd494 · 1efd494
1 parent ef5dce4
commit 1efd494
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17)
+cmake_minimum_required(VERSION 3.21)
 
 set(VCPKG_LIBRARY_LINKAGE "dynamic" CACHE STRING "Link vcpkg libraries dynamically")
 

diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17)
+cmake_minimum_required(VERSION 3.21)
 
 option(MV_UNITY_BUILD "Combine target source files into batches for faster compilation" OFF)
 

diff --git a/conanfile.py b/conanfile.py
@@ -98,8 +98,10 @@ def generate(self):
 
         # Use the Qt provided .cmake files
         qtpath = pathlib.Path(self.deps_cpp_info["qt"].rootpath)
-        qt_root = str(list(qtpath.glob("**/Qt6Config.cmake"))[0].parents[3].as_posix())
-        tc.variables["CMAKE_PREFIX_PATH"] = qt_root
+        qt_root = str(list(qtpath.glob("**/Qt6Config.cmake"))[0].parents[0].as_posix())
+
+        print("Qt6_DIR: ", qt_root)
+        tc.variables["Qt6_DIR"] = qt_root
 
         # Set the installation directory for ManiVault based on the MV_INSTALL_DIR environment variable
         # or if none is specified, set it to the build/install dir.