CMAKE_C_LIBRARY_ARCHITECTURE

Set CMAKE_C_LIBRARY_ARCHITECTURE for newer versions of CMake. The
CMAKE_LIBRARY_ARCHITECTURE is a meta-variable that is set from the
value of CMAKE_<LANG>_LIBRARY_ARCHITECTURE in at least 3.15 onward.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index beafd911a0c69f9bf0a5a90cea9a63561da19473..36b008eb654ef57afc346be34c7b69c233612272 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2551,19 +2551,19 @@ endif(NOT BUILD_SHARED_LIBS)
 if(WIN32)
     if(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
         #
-        # Install 64-bit code built with MSVC in the amd64 subdirectories,
+        # Install 64-bit code built with MSVC in the x64 subdirectories,
         # as that's where it expects it to be.
         #
         install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME_STATIC}
-                RUNTIME DESTINATION bin/amd64
-                LIBRARY DESTINATION lib/amd64
-                ARCHIVE DESTINATION lib/amd64)
+                RUNTIME DESTINATION bin/x64
+                LIBRARY DESTINATION lib/x64
+                ARCHIVE DESTINATION lib/x64)
         if(NOT MINGW)
             install(FILES $<TARGET_FILE_DIR:${LIBRARY_NAME_STATIC}>/${LIBRARY_NAME_STATIC}.pdb
-                    DESTINATION bin/amd64 OPTIONAL)
+                    DESTINATION bin/x64 OPTIONAL)
             if(BUILD_SHARED_LIBS)
                 install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}>
-                        DESTINATION bin/amd64 OPTIONAL)
+                        DESTINATION bin/x64 OPTIONAL)
             endif(BUILD_SHARED_LIBS)
         endif(NOT MINGW)
     else(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)