Commit 143eff3b authored by Jørgen Lind's avatar Jørgen Lind
Browse files

AzureStorage doesn't use GnuInstallDirs

parent be6a3784
...@@ -6,9 +6,9 @@ function(BuildAzure) ...@@ -6,9 +6,9 @@ function(BuildAzure)
elseif (APPLE) elseif (APPLE)
list(APPEND AZURE_LIBS_LIST "lib/libwastorage.dylib") list(APPEND AZURE_LIBS_LIST "lib/libwastorage.dylib")
else() else()
list(APPEND AZURE_LIBS_LIST "lib${LIBSUFFIX}/libazurestorage.so.7.0") list(APPEND AZURE_LIBS_LIST "lib/libazurestorage.so.7.0")
list(APPEND AZURE_LIBS_LIST "lib${LIBSUFFIX}/libazurestorage.so.7") list(APPEND AZURE_LIBS_LIST "lib/libazurestorage.so.7")
list(APPEND AZURE_LIBS_LIST "lib${LIBSUFFIX}/libazurestorage.so") list(APPEND AZURE_LIBS_LIST "lib/libazurestorage.so")
endif() endif()
set(AzureCmakeDir "${azure-storage-cpp_SOURCE_DIR}/Microsoft.WindowsAzure.Storage") set(AzureCmakeDir "${azure-storage-cpp_SOURCE_DIR}/Microsoft.WindowsAzure.Storage")
if (WIN32) if (WIN32)
......
...@@ -14,17 +14,11 @@ set (TEST_AWS_OBJECTID "" CACHE STRING "Test AWS object ID") ...@@ -14,17 +14,11 @@ set (TEST_AWS_OBJECTID "" CACHE STRING "Test AWS object ID")
set(OPENVDS_LIBDIR_SUFFIX "" CACHE STRING "Suffix to add to lib directories on linux") set(OPENVDS_LIBDIR_SUFFIX "" CACHE STRING "Suffix to add to lib directories on linux")
option(FORCE_NO_LIBDIR_SUFFIX "Force there to be no suffix on lib directories linux") option(FORCE_NO_LIBDIR_SUFFIX "Force there to be no suffix on lib directories linux")
if (FORCE_NO_LIBDIR_SUFFIX) get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
set(LIBSUFFIX "") if ("${LIB64}" STREQUAL "TRUE")
elseif (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) set(LIBSUFFIX 64)
else() else()
set(LIBSUFFIX "") set(LIBSUFFIX "")
endif()
endif() endif()
set(BUILD_PYTHON_DEFAULT ON) set(BUILD_PYTHON_DEFAULT ON)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment