Merge pull request #1316.

CMake build: use consistent naming for tagged libraries.
lballabio · Mar 7, 2022 · 8c3a0ac · 8c3a0ac
2 parents 7e81a0e + 99d2549
commit 8c3a0ac
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -167,18 +167,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})