diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a9ca20..a12a30c 100644 --- 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 index 4d91fb7..5569dfc 100644 --- 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 index a61f0ff..6c33f68 100644 --- a/conanfile.py +++ b/conanfile.py @@ -97,9 +97,14 @@ def generate(self): tc.variables["CMAKE_CXX_STANDARD_REQUIRED"] = "ON" # 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_path = pathlib.Path(self.deps_cpp_info["qt"].rootpath) + qt_cfg = list(qt_path.glob("**/Qt6Config.cmake"))[0] + qt_root = str(qt_cfg.parents[0].as_posix()) + qt_dir = str(qt_cfg.parents[3].as_posix()) + + print("Qt6_DIR: ", qt_root) + tc.variables["Qt6_DIR"] = qt_root + tc.variables["CMAKE_PREFIX_PATH"] = qt_dir # 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.