diff --git a/cmake/tools/SetupWebKit.cmake b/cmake/tools/SetupWebKit.cmake index d48552420b..d3283cd2fd 100644 --- a/cmake/tools/SetupWebKit.cmake +++ b/cmake/tools/SetupWebKit.cmake @@ -41,14 +41,6 @@ if(WEBKIT_LOCAL) return() endif() -if(EXISTS ${WEBKIT_PATH}/package.json) - file(READ ${WEBKIT_PATH}/package.json WEBKIT_PACKAGE_JSON) - - if(WEBKIT_PACKAGE_JSON MATCHES ${WEBKIT_VERSION}) - return() - endif() -endif() - if(WIN32) set(WEBKIT_OS "windows") elseif(APPLE) @@ -86,10 +78,18 @@ if(ENABLE_ASAN) set(WEBKIT_SUFFIX "${WEBKIT_SUFFIX}-asan") endif() -set(WEBKIT_NAME bun-webkit-${WEBKIT_OS}-${WEBKIT_ARCH}${WEBKIT_SUFFIX}) +setx(WEBKIT_NAME bun-webkit-${WEBKIT_OS}-${WEBKIT_ARCH}${WEBKIT_SUFFIX}) set(WEBKIT_FILENAME ${WEBKIT_NAME}.tar.gz) setx(WEBKIT_DOWNLOAD_URL https://github.com/oven-sh/WebKit/releases/download/autobuild-${WEBKIT_VERSION}/${WEBKIT_FILENAME}) +if(EXISTS ${WEBKIT_PATH}/package.json) + file(READ ${WEBKIT_PATH}/package.json WEBKIT_PACKAGE_JSON) + + if(WEBKIT_PACKAGE_JSON MATCHES ${WEBKIT_VERSION}) + return() + endif() +endif() + file(DOWNLOAD ${WEBKIT_DOWNLOAD_URL} ${CACHE_PATH}/${WEBKIT_FILENAME} SHOW_PROGRESS) file(ARCHIVE_EXTRACT INPUT ${CACHE_PATH}/${WEBKIT_FILENAME} DESTINATION ${CACHE_PATH} TOUCH) file(REMOVE ${CACHE_PATH}/${WEBKIT_FILENAME})