Commit ec8800d0 authored by Andrew K's avatar Andrew K Committed by Jørgen Lind
Browse files

Fix build for Fedora 31

- Set CMAKE_INSTALL_DIR to lib${LIBSUFFIX} for Azure Storage SDK
  * Azure Storage SDK does not use GNUInstallDir cmake include to
    set the CMAKE_INSTALL_<dir> variables resulting in invalid LIBDIR
    paths for distributions that use lib64. However, they provide a way
    to override it which is what this change uses to set the correct path

- Add WERROR=OFF for cpprestsdk
  * Warning about deprecated-copy when building with gcc 9. Causes
    the build to fail if werror is enabled

- Remove const from dimensionDistribution
  * uniform_real_distribution<float> call operator is not const which
    causes an error when building with gcc 9
parent e09ac7fd
......@@ -22,7 +22,7 @@ function(BuildCppRestSdk)
list(APPEND CPPRESTSDK_LIBS_LIST_DEBUG "lib${LIBSUFFIX}/libcpprest.so.2.10")
list(APPEND CPPRESTSDK_LIBS_LIST_DEBUG "lib${LIBSUFFIX}/libcpprest.so")
endif()
BuildExternal(cpp-rest-api ${cpprestapi_VERSION} "" ${cpprestapi_SOURCE_DIR} "${CPPRESTSDK_LIBS_LIST_RELEASE}" "${CPPRESTSDK_DLLS_LIST_RELEASE}" "${CPPRESTSDK_LIBS_LIST_DEBUG}" "${CPPRESTSDK_DLLS_LIST_DEBUG}" "-DCPPREST_EXCLUDE_WEBSOCKETS=ON;-DCPPREST_EXCLUDE_COMPRESSION=ON;-DCPPREST_EXCLUDE_BROTLI=ON")
BuildExternal(cpp-rest-api ${cpprestapi_VERSION} "" ${cpprestapi_SOURCE_DIR} "${CPPRESTSDK_LIBS_LIST_RELEASE}" "${CPPRESTSDK_DLLS_LIST_RELEASE}" "${CPPRESTSDK_LIBS_LIST_DEBUG}" "${CPPRESTSDK_DLLS_LIST_DEBUG}" "-DCPPREST_EXCLUDE_WEBSOCKETS=ON;-DCPPREST_EXCLUDE_COMPRESSION=ON;-DCPPREST_EXCLUDE_BROTLI=ON;-DWERROR=OFF")
set(cpp-rest-api_INSTALL_INT_CONFIG ${cpp-rest-api_INSTALL_INT_CONFIG} PARENT_SCOPE)
#add_definitions(-DUSE_IMPORT_EXPORT)
......
......@@ -129,6 +129,9 @@ if (aws-cpp-sdk_EXTERNAL_LIBS)
endif()
target_link_libraries(openvds_objects PUBLIC $<$<NOT:$<CONFIG:Debug>>:${link_3rdparty_release}> $<$<CONFIG:Debug>:${link_3rdparty_debug}>)
# this need to be explicitly included on centos7 for some reason
target_link_libraries(openvds_objects PUBLIC "ssl")
#Azure storage exposes boost_system on linux et al.
if (UNIX)
target_link_libraries(openvds_objects PUBLIC boost_system)
......
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