From b87d3fdd722bf12457a3bc6b77632c1d0bab6449 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 9 Oct 2024 13:21:59 +0200 Subject: [PATCH] Oh what fun, msvc 2019 on the ci --- ExampleDependencies/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index 521f1c3..3105135 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -21,7 +21,7 @@ if(MSVC) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") endif(MSVC) -include(cmake/get_cpm.cmake) +# include(cmake/get_cpm.cmake) # ----------------------------------------------------------------------------- # Dependencies @@ -30,20 +30,20 @@ find_package(Qt6 COMPONENTS Widgets WebEngineWidgets REQUIRED) find_package(ManiVault COMPONENTS Core PointData CONFIG) -find_package(blake3 CONFIG REQUIRED) +# find_package(blake3 CONFIG REQUIRED) if(NOT APPLE) include(cmake/ci_fixes.cmake) find_package(faiss CONFIG REQUIRED) endif() -CPMAddPackage( - NAME highway - URL https://github.com/google/highway/archive/refs/tags/1.2.0.tar.gz - URL_HASH SHA256=7e0be78b8318e8bdbf6fa545d2ecb4c90f947df03f7aadc42c1967f019e63343 - PATCHES "cmake/highway.patch" # see https://github.com/conan-io/conan-center-index/pull/24197/files, fixes https://github.com/google/highway/issues/2225 - OPTIONS "HWY_ENABLE_EXAMPLES OFF" "HWY_ENABLE_INSTALL OFF" "HWY_ENABLE_TESTS OFF" "HWY_ENABLE_CONTRIB ON" "BUILD_SHARED_LIBS ON" -) +# CPMAddPackage( + # NAME highway + # URL https://github.com/google/highway/archive/refs/tags/1.2.0.tar.gz + # URL_HASH SHA256=7e0be78b8318e8bdbf6fa545d2ecb4c90f947df03f7aadc42c1967f019e63343 + # PATCHES "cmake/highway.patch" # see https://github.com/conan-io/conan-center-index/pull/24197/files, fixes https://github.com/google/highway/issues/2225 + # OPTIONS "HWY_ENABLE_EXAMPLES OFF" "HWY_ENABLE_INSTALL OFF" "HWY_ENABLE_TESTS OFF" "HWY_ENABLE_CONTRIB ON" "BUILD_SHARED_LIBS ON" +# ) # ----------------------------------------------------------------------------- # Source files @@ -93,8 +93,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::WebEngineWidgets) target_link_libraries(${PROJECT_NAME} PRIVATE ManiVault::Core) target_link_libraries(${PROJECT_NAME} PRIVATE ManiVault::PointData) -target_link_libraries(${PROJECT_NAME} PRIVATE BLAKE3::blake3) -target_link_libraries(${PROJECT_NAME} PRIVATE hwy hwy_contrib) +# target_link_libraries(${PROJECT_NAME} PRIVATE BLAKE3::blake3) +# target_link_libraries(${PROJECT_NAME} PRIVATE hwy hwy_contrib) if(NOT APPLE) target_link_libraries(${PROJECT_NAME} PRIVATE faiss)