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..15253c9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -96,11 +96,6 @@ 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 - # 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. if not os.environ.get("MV_INSTALL_DIR", None): diff --git a/vcpkg.json b/vcpkg.json index bb9ec28..24cf1b1 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,6 +3,7 @@ "version": "0.0.1", "dependencies": [ "blake3", + "qt", { "name": "faiss", "platform": "!osx" @@ -11,6 +12,7 @@ "builtin-baseline":"73964f854d0d6424f335e9515b61b3a2dad5e15b", "overrides": [ { "name": "blake3", "version": "1.5.1" }, + { "name": "qt", "version": "6.3.2#1" }, { "name": "faiss", "version": "1.7.4" } ] } \ No newline at end of file