aws-iot-device-sdk-cpp-v2-v1.12.2.patch 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. --- aws-iot-device-sdk-cpp-v2-orig/crt/aws-crt-cpp/crt/aws-c-common/cmake/AwsSharedLibSetup.cmake 2021-04-19 10:00:25.727859800 -0500
  2. +++ aws-iot-device-sdk-cpp-v2/crt/aws-crt-cpp/crt/aws-c-common/cmake/AwsSharedLibSetup.cmake 2021-04-19 09:34:20.334467600 -0500
  3. @@ -1,13 +1,21 @@
  4. # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  5. # SPDX-License-Identifier: Apache-2.0.
  6. -set(LIBRARY_DIRECTORY lib)
  7. -set(RUNTIME_DIRECTORY bin)
  8. +if(DEFINED CMAKE_INSTALL_LIBDIR)
  9. + set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
  10. +else()
  11. + set(LIBRARY_DIRECTORY lib)
  12. +endif()
  13. +
  14. +if(DEFINED CMAKE_INSTALL_BINDIR)
  15. + set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
  16. +else()
  17. + set(RUNTIME_DIRECTORY bin)
  18. +endif()
  19. +
  20. # Set the default lib installation path on GNU systems with GNUInstallDirs
  21. if (UNIX AND NOT APPLE)
  22. include(GNUInstallDirs)
  23. - set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
  24. - set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
  25. # this is the absolute dumbest thing in the world, but find_package won't work without it
  26. # also I verified this is correctly NOT "lib64" when CMAKE_C_FLAGS includes "-m32"
  27. --- aws-iot-device-sdk-cpp-v2-orig/crt/aws-crt-cpp/crt/aws-checksums/cmake/AwsSharedLibSetup.cmake 2021-04-19 10:00:41.994449100 -0500
  28. +++ aws-iot-device-sdk-cpp-v2/crt/aws-crt-cpp/crt/aws-checksums/cmake/AwsSharedLibSetup.cmake 2021-04-19 09:35:03.311355400 -0500
  29. @@ -1,13 +1,21 @@
  30. # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  31. # SPDX-License-Identifier: Apache-2.0.
  32. -set(LIBRARY_DIRECTORY lib)
  33. -set(RUNTIME_DIRECTORY bin)
  34. +if(DEFINED CMAKE_INSTALL_LIBDIR)
  35. + set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
  36. +else()
  37. + set(LIBRARY_DIRECTORY lib)
  38. +endif()
  39. +
  40. +if(DEFINED CMAKE_INSTALL_BINDIR)
  41. + set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
  42. +else()
  43. + set(RUNTIME_DIRECTORY bin)
  44. +endif()
  45. +
  46. # Set the default lib installation path on GNU systems with GNUInstallDirs
  47. if (UNIX AND NOT APPLE)
  48. include(GNUInstallDirs)
  49. - set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
  50. - set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
  51. # this is the absolute dumbest thing in the world, but find_package won't work without it
  52. # also I verified this is correctly NOT "lib64" when CMAKE_C_FLAGS includes "-m32"