installer: suffixed lib paths

Author: Hugo Lindström

cmake/BoostLibInstaller.cmake

@@ -105,10 +105,21 @@ function(boost_lib_installer req_boost_version req_boost_libs)
                     set(debug_lib_path "${install_dir}/${stage_dir}/lib/libboost_${lib_name}-${compiler_name}-mt-gd-${lib_postfix}.lib")
                     set(lib_path "${install_dir}/${stage_dir}/lib/libboost_${lib_name}-${compiler_name}-mt-${lib_postfix}.lib")
                 else()
+                    set(LIBSUFFIX "")
+                    if(UNIX)
+                        if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+                            set(LIBSUFFIX "-x64")
+                        endif()
+                    endif()
+                    if(APPLE)
+                        string(REGEX MATCH "address-model\\=([0-9_]+)" model "${b2Args}")
+                        set(ADDRESS_MODEL ${CMAKE_MATCH_1})
+                        set(LIBSUFFIX "-c${ADDRESS_MODEL}")
+                    endif()
                     if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "") OR (NOT DEFINED CMAKE_BUILD_TYPE))
-                        set(lib_path "${install_dir}/${stage_dir}/lib/libboost_${lib_name}-mt-d.a")
+                        set(lib_path "${install_dir}/${stage_dir}/lib/libboost_${lib_name}-mt-d${LIBSUFFIX}.a")
                     else()
-                        set(lib_path "${install_dir}/${stage_dir}/lib/libboost_${lib_name}-mt.a")
+                        set(lib_path "${install_dir}/${stage_dir}/lib/libboost_${lib_name}-mt${LIBSUFFIX}.a")
                     endif()
                 endif()