From 99d25492d45711f4b43441e4369f6a3a391b0d60 Mon Sep 17 00:00:00 2001 From: Luigi Ballabio Date: Mon, 7 Mar 2022 12:33:48 +0100 Subject: [PATCH] CMake build: use consistent naming for tagged libraries. It should be the same as the one defined in the VC++ projects and the ql/auto_link.hpp header. --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4394260331e..237c6ee32a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,18 +159,18 @@ configure_file(ql/version.hpp.cfg ql/version.hpp @ONLY) # Check for library name layout tagging if (QL_TAGGED_LAYOUT) - set(DEBUG_POSTFIX "-mt") - set(RELEASE_POSTFIX "-mt") + if (${CMAKE_SIZEOF_VOID_P} EQUAL 8) + set(DEBUG_POSTFIX "-x64") + set(RELEASE_POSTFIX "-x64") + endif() + set(DEBUG_POSTFIX ${DEBUG_POSTFIX}-mt) + set(RELEASE_POSTFIX ${RELEASE_POSTFIX}-mt) if (NOT BUILD_SHARED_LIBS) set(DEBUG_POSTFIX ${DEBUG_POSTFIX}-sgd) set(RELEASE_POSTFIX ${RELEASE_POSTFIX}-s) else() set(DEBUG_POSTFIX ${DEBUG_POSTFIX}-gd) endif() - if (${CMAKE_SIZEOF_VOID_P} EQUAL 8) - set(DEBUG_POSTFIX ${DEBUG_POSTFIX}-x64) - set(RELEASE_POSTFIX ${RELEASE_POSTFIX}-x64) - endif() set(CMAKE_DEBUG_POSTFIX ${DEBUG_POSTFIX}) set(CMAKE_RELEASE_POSTFIX ${RELEASE_POSTFIX}) set(CMAKE_RELWITHDEBINFO_POSTFIX ${RELEASE_POSTFIX})