Skip to content

Commit

Permalink
Oh what fun, msvc 2019 on the ci
Browse files Browse the repository at this point in the history
  • Loading branch information
alxvth committed Oct 9, 2024
1 parent c03cb83 commit b87d3fd
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions ExampleDependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b87d3fd

Please sign in to comment.