Make the LIBSUFFIX configurable

CMake/BuildAWSSDK.cmake

 macro(BuildAWSSDK)
-    get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-    if ("${LIB64}" STREQUAL "TRUE")
-        set(LIBSUFFIX 64)
-    else()
-        set(LIBSUFFIX "")
-    endif()
-
   if (WIN32)
     list(APPEND AWS_LIBS_LIST "bin/aws-cpp-sdk-core.lib")
     list(APPEND AWS_LIBS_LIST "bin/aws-cpp-sdk-s3.lib")

CMake/BuildAzure.cmake

 function(BuildAzure)
-    get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-    if ("${LIB64}" STREQUAL "TRUE")
-        set(LIBSUFFIX 64)
-    else()
-        set(LIBSUFFIX "")
-    endif()
-
   if (WIN32)
     list(APPEND AZURE_LIBS_LIST "lib/wastorage.lib")
 

CMake/BuildCppRestSdk.cmake

 function(BuildCppRestSdk)
-    get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-    if ("${LIB64}" STREQUAL "TRUE")
-        set(LIBSUFFIX 64)
-    else()
-        set(LIBSUFFIX "")
-    endif()
-
   if (WIN32)
     get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
     if (${_isMultiConfig})

CMake/BuildZlib.cmake

 macro(BuildZlib)
-    get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-    if ("${LIB64}" STREQUAL "TRUE")
-        set(LIBSUFFIX 64)
-    else()
-        set(LIBSUFFIX "")
-    endif()
-
   if (WIN32)
     list(APPEND ZLIB_LIBS_LIST_RELEASE "lib/zlib.lib")
     list(APPEND ZLIB_LIBS_LIST_DEBUG   "lib/zlibd.lib")

CMakeLists.txt

@@ -11,6 +11,19 @@ set (TEST_AWS_REGION "" CACHE STRING "Test AWS region")
 set (TEST_AWS_BUCKET "" CACHE STRING "Test AWS bucket")
 set (TEST_AWS_OBJECTID "" CACHE STRING "Test AWS object ID")
 
+set(OPENVDS_LIBDIR_SUFFIX "" CACHE STRING "Suffix to add to lib directories on linux")
+
+if (OPENVDS_LIBDIR_SUFFIX)
+  set(LIBSUFFIX ${OPENVDS_LIBDIR_SUFFIX})
+else()
+  get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+  if ("${LIB64}" STREQUAL "TRUE")
+    set(LIBSUFFIX 64)
+  else()
+    set(LIBSUFFIX "")
+  endif()
+endif()
+
 set(BUILD_PYTHON_DEFAULT ON)
 find_package(Python3 COMPONENTS Interpreter)
 if (Python3_FOUND)