From 44dddf328c47f8402005d1e21e6565b7d62f2e0f Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Mon, 23 Sep 2024 12:59:20 +0200 Subject: [PATCH] Some qt notes --- ExampleDependencies/CMakeLists.txt | 1 + conanfile.py | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index 4d91fb7..fc569eb 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -33,6 +33,7 @@ find_package(ManiVault COMPONENTS Core PointData CONFIG) find_package(blake3 CONFIG REQUIRED) if(NOT APPLE) + find_package(lapack CONFIG REQUIRED) # only for backwards-compatability with cmake < 3.21 find_package(faiss CONFIG REQUIRED) endif() diff --git a/conanfile.py b/conanfile.py index a61f0ff..78e63ae 100644 --- a/conanfile.py +++ b/conanfile.py @@ -97,9 +97,17 @@ 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()) + + # for Qt >= 6.4.2 + #print("Qt6_DIR: ", qt_root) + #tc.variables["Qt6_DIR"] = qt_root + + # for Qt < 6.4.2 + 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. @@ -114,7 +122,7 @@ def generate(self): # Set some build options tc.variables["MV_UNITY_BUILD"] = "ON" - + # Install vcpkg dependencies vcpkg_dir = os.environ["VCPKG_ROOT"] vcpkg_exe = os.path.join(vcpkg_dir, "vcpkg.exe") if self.settings.os == "Windows" else os.path.join(vcpkg_dir, "vcpkg")