From a46a77a8b4c755c72168a57a1140af5d940257ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Tue, 8 Nov 2022 10:59:02 +0100 Subject: [PATCH] wasm: disable x.y.z suffix versioning This simplifies deployment and eliminates the possibility for duplicate downloads due to the browser/server not understanding symlinks. Change-Id: Ife22c052c424f309d76ff0f9118c01e98426da95 Reviewed-by: Alexandru Croitor --- cmake/QtModuleHelpers.cmake | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 8a8912bfb4b..0ea074ac54c 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -327,14 +327,21 @@ function(qt_internal_add_module target) EXPORT_PROPERTIES "${export_properties}") endif() + if(WASM AND BUILD_SHARED_LIBS) + set(version_args "") + else() + set(version_args + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR}) + endif() + if(NOT arg_HEADER_MODULE) set_target_properties(${target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}" RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}" ARCHIVE_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}" - VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_VERSION_MAJOR} - ) + ${version_args} + ) qt_set_target_info_properties(${target} ${ARGN}) qt_handle_multi_config_output_dirs("${target}")