From f093d8155c4b4b520a5e5da45097060751539b8b Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Wed, 12 Oct 2022 23:34:56 +0200 Subject: [PATCH] Use sampler library if present --- cmake/modules/FindV8.cmake | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindV8.cmake b/cmake/modules/FindV8.cmake index 7ad83b9d15..98138604d5 100644 --- a/cmake/modules/FindV8.cmake +++ b/cmake/modules/FindV8.cmake @@ -280,16 +280,23 @@ if(MSVC) endif() else() if(CMAKE_BUILD_TYPE EQUAL "Debug") - if(V8_LIBRARY_DEBUG AND V8_PLATFORM_LIBRARY_DEBUG) - set(V8_LIBRARY ${V8_LIBRARY_DEBUG} ${V8_PLATFORM_LIBRARY_DEBUG}) # ${V8_SAMPLER_LIBRARY_DEBUG}) # ${V8_ICU_LIBRARY_DEBUG}) + if(V8_LIBRARY_DEBUG AND V8_PLATFORM_LIBRARY_DEBUG AND V8_SAMPLER_LIBRARY_DEBUG) + set(V8_LIBRARY ${V8_LIBRARY_DEBUG} ${V8_PLATFORM_LIBRARY_DEBUG} ${V8_SAMPLER_LIBRARY_DEBUG}) # ${V8_ICU_LIBRARY_DEBUG}) + elseif(V8_LIBRARY_DEBUG AND V8_PLATFORM_LIBRARY_DEBUG) + set(V8_LIBRARY ${V8_LIBRARY_DEBUG} ${V8_PLATFORM_LIBRARY_DEBUG}) # ${V8_SAMPLER_LIBRARY_DEBUG}) # ${V8_ICU_LIBRARY_DEBUG}) else() - if(V8_LIBRARY_RELEASE AND V8_PLATFORM_LIBRARY_RELEASE) + if(V8_LIBRARY_RELEASE AND V8_PLATFORM_LIBRARY_RELEASE AND V8_SAMPLER_LIBRARY_RELEASE) + set(V8_LIBRARY ${V8_LIBRARY_RELEASE} ${V8_PLATFORM_LIBRARY_RELEASE} ${V8_SAMPLER_LIBRARY_RELEASE}) # ${V8_ICU_LIBRARY_DEBUG}) + elseif(V8_LIBRARY_RELEASE AND V8_PLATFORM_LIBRARY_RELEASE) set(V8_LIBRARY ${V8_LIBRARY_RELEASE} ${V8_PLATFORM_LIBRARY_RELEASE}) # ${V8_SAMPLER_LIBRARY_RELEASE}) # ${V8_ICU_LIBRARY_DEBUG}) endif() endif() else() - if(V8_LIBRARY_RELEASE AND V8_PLATFORM_LIBRARY_RELEASE ) + if(V8_LIBRARY_RELEASE AND V8_PLATFORM_LIBRARY_RELEASE AND V8_SAMPLER_LIBRARY_RELEASE) + set(V8_LIBRARY ${V8_LIBRARY_RELEASE} ${V8_PLATFORM_LIBRARY_RELEASE} ${V8_SAMPLER_LIBRARY_RELEASE}) # ${V8_ICU_LIBRARY_RELEASE}) + elseif(V8_LIBRARY_RELEASE AND V8_PLATFORM_LIBRARY_RELEASE ) set(V8_LIBRARY ${V8_LIBRARY_RELEASE} ${V8_PLATFORM_LIBRARY_RELEASE} ) # ${V8_SAMPLER_LIBRARY_RELEASE} ${V8_ICU_LIBRARY_RELEASE}) + endif() endif()