Second attempt: hashing with cmake.

vectorgraphics · Feb 22, 2025 · 377b98b · 377b98b
1 parent c7a59cf
commit 377b98b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,10 +31,6 @@ list(APPEND ASY_STATIC_LIBARIES PRC)
 get_target_property(prc_incl_dir PRC INCLUDE_DIRECTORIES)
 list(APPEND ASYMPTOTE_INCLUDES $<TARGET_PROPERTY:PRC,INCLUDE_DIRECTORIES>)
 
-# highwayhash
-add_subdirectory(highwayhash/)
-list(APPEND ASY_STATIC_LIBARIES highwayhash)
-
 include(cmake-scripts/gnu-install-macros.cmake)
 include(cmake-scripts/asy-macro.cmake)
 

diff --git a/cmake-scripts/subrepo-projects.cmake b/cmake-scripts/subrepo-projects.cmake
@@ -4,6 +4,15 @@ set(LSP_REPO_ROOT ${ASY_SUBREPO_CLONE_ROOT}/LspCpp)
 set(TINYEXR_SUBREPO_ROOT ${ASY_SUBREPO_CLONE_ROOT}/tinyexr)
 set(BOEHM_GC_ROOT ${ASY_SUBREPO_CLONE_ROOT}/gc)
 set(LIBATOMIC_OPS_ROOT ${ASY_SUBREPO_CLONE_ROOT}/libatomic_ops)
+set(HIGHWAYHASH_ROOT ${ASY_SUBREPO_CLONE_ROOT}/highwayhash)
+
+# highwayhash
+set(OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "highwayhash shared libs flag")
+add_subdirectory(${HIGHWAYHASH_ROOT})
+unset(BUILD_SHARED_LIBS CACHE)
+set(BUILD_SHARED_LIBS ${OLD_BUILD_SHARED_LIBS})
+list(APPEND ASY_STATIC_LIBARIES highwayhash)
 
 # boehm gc
 if (ENABLE_GC)