diff options
author | Simon McVittie <smcv@collabora.com> | 2020-02-20 01:02:48 +0000 |
---|---|---|
committer | Simon McVittie <smcv@collabora.com> | 2020-02-20 01:02:48 +0000 |
commit | 6dc7b49098b11c4864fbda3dd9f30eec48445e05 (patch) | |
tree | 3578b6fa207c1a32af5f260644e3b0041e79c261 | |
parent | a60f4a2ca0c55145ce78f62486ee4e3ff16d04ce (diff) | |
parent | 8ffe1b949c67a17da5b873cf10bd4c3cc7adeb30 (diff) |
Merge branch 'fix-libdbus-version-info' into 'master'
Fix libdbus version info
See merge request dbus/dbus!138
-rw-r--r-- | cmake/modules/Macros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake index 33fbcbb2..fed16007 100644 --- a/cmake/modules/Macros.cmake +++ b/cmake/modules/Macros.cmake @@ -194,7 +194,7 @@ endmacro() macro(add_library_version_info _sources _name) set(DBUS_VER_INTERNAL_NAME "${_name}") - set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}}${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(DBUS_VER_ORIGINAL_NAME "${DBUS_VER_INTERNAL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}") set(DBUS_VER_FILE_TYPE "VFT_DLL") configure_file(${CMAKE_SOURCE_DIR}/dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc) # version info and uac manifest can be combined in a binary because they use different resource types |