From f04af62fd2468f57871f93f3b2798abb83cc3d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 22 May 2023 20:28:14 +0200 Subject: [PATCH] Prefer libnode.so.108 to prevent wrong system libnode being used over vcpkg libnode. --- cmake/modules/FindV8.cmake | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cmake/modules/FindV8.cmake b/cmake/modules/FindV8.cmake index 53fa880c87..519c72edfc 100644 --- a/cmake/modules/FindV8.cmake +++ b/cmake/modules/FindV8.cmake @@ -109,20 +109,20 @@ find_path(V8_INCLUDE_DIR ${V8_HEADERS} MESSAGE("V8 include dir: ${V8_INCLUDE_DIR}") # Define library names -set(V8_NAMES_DEBUG libnode libnode.so libnode.lib libnode.so.108 v8D v8_baseD v8_base.ia32D v8_base.x64D libv8_baseD v8_baseD.lib v8_libbaseD v8_libbase.ia32D v8_libbase.x64D libv8_libbaseD v8_libbaseD.lib) -set(V8_NAMES_RELEASE libnode libnode.so libnode.lib libnode.so.108 v8 v8_base v8_base.ia32 v8_base.x64 libv8_base v8_base.lib v8_libbase v8_libbase.ia32 v8_libbase.x64 libv8_libbase v8_libbase.lib) -set(V8_PLATFORM_NAMES_DEBUG v8_libplatform.lib libnode libnode.so libnode.lib libnode.so.108 v8_libplatformD v8_libplatformD.a v8_libplatformD.lib) -set(V8_PLATFORM_NAMES_RELEASE v8_libplatform.lib libnode libnode.so libnode.lib libnode.so.108 v8_libplatform v8_libplatform.a) -set(V8_SAMPLER_NAMES_DEBUG libnode libnode.so libnode.lib libnode.so.108 v8_libsamplerD v8_libsamplerD.a v8_libsamplerD.lib) -set(V8_SAMPLER_NAMES_RELEASE libnode libnode.so libnode.lib libnode.so.108 v8_libsampler v8_libsampler.a v8_libsampler.lib) -set(V8_SNAPSHOT_NAMES_DEBUG libnode libnode.so libnode.lib libnode.so.108 v8_snapshotD libv8_snapshotD v8_snapshotD.lib) -set(V8_SNAPSHOT_NAMES_RELEASE libnode libnode.so libnode.lib libnode.so.108 v8_snapshot libv8_snapshot v8_snapshot.lib) -set(V8_ICU_NAMES_DEBUG libnode libnode.so libnode.lib libnode.so.108 icudataD icudataD.a icudataD.lib) -set(V8_ICU_NAMES_RELEASE libnode libnode.so libnode.lib libnode.so.108 icudata icudata.a icudata.lib) -set(V8_ICUUC_NAMES_DEBUG libnode libnode.so libnode.lib libnode.so.108 icuucD libicuucD) -set(V8_ICUUC_NAMES_RELEASE libnode libnode.so libnode.lib libnode.so.108 icuuc libicuuc) -set(V8_ICUI18N_NAMES_DEBUG libnode libnode.so libnode.lib libnode.so.108 icui18nD libicui18nD) -set(V8_ICUI18N_NAMES_RELEASE libnode libnode.so libnode.lib libnode.so.108 icui18n libicui18n) +set(V8_NAMES_DEBUG libnode.so.108 libnode libnode.so libnode.lib v8D v8_baseD v8_base.ia32D v8_base.x64D libv8_baseD v8_baseD.lib v8_libbaseD v8_libbase.ia32D v8_libbase.x64D libv8_libbaseD v8_libbaseD.lib) +set(V8_NAMES_RELEASE libnode.so.108 libnode libnode.so libnode.lib v8 v8_base v8_base.ia32 v8_base.x64 libv8_base v8_base.lib v8_libbase v8_libbase.ia32 v8_libbase.x64 libv8_libbase v8_libbase.lib) +set(V8_PLATFORM_NAMES_DEBUG libnode.so.108 v8_libplatform.lib libnode libnode.so libnode.lib v8_libplatformD v8_libplatformD.a v8_libplatformD.lib) +set(V8_PLATFORM_NAMES_RELEASE libnode.so.108 v8_libplatform.lib libnode libnode.so libnode.lib v8_libplatform v8_libplatform.a) +set(V8_SAMPLER_NAMES_DEBUG libnode.so.108 libnode libnode.so libnode.lib v8_libsamplerD v8_libsamplerD.a v8_libsamplerD.lib) +set(V8_SAMPLER_NAMES_RELEASE libnode.so.108 libnode libnode.so libnode.lib v8_libsampler v8_libsampler.a v8_libsampler.lib) +set(V8_SNAPSHOT_NAMES_DEBUG libnode.so.108 libnode libnode.so libnode.lib v8_snapshotD libv8_snapshotD v8_snapshotD.lib) +set(V8_SNAPSHOT_NAMES_RELEASE libnode.so.108 libnode libnode.so libnode.lib v8_snapshot libv8_snapshot v8_snapshot.lib) +set(V8_ICU_NAMES_DEBUG libnode.so.108 libnode libnode.so libnode.lib icudataD icudataD.a icudataD.lib) +set(V8_ICU_NAMES_RELEASE libnode.so.108 libnode libnode.so libnode.lib icudata icudata.a icudata.lib) +set(V8_ICUUC_NAMES_DEBUG libnode.so.108 libnode libnode.so libnode.lib icuucD libicuucD) +set(V8_ICUUC_NAMES_RELEASE libnode.so.108 libnode libnode.so libnode.lib icuuc libicuuc) +set(V8_ICUI18N_NAMES_DEBUG libnode.so.108 libnode libnode.so libnode.lib icui18nD libicui18nD) +set(V8_ICUI18N_NAMES_RELEASE libnode.so.108 libnode libnode.so libnode.lib icui18n libicui18n) # Find V8 base library debug find_library(V8_LIBRARY_DEBUG