1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 |
- --- 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
- +++ 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
- @@ -1,13 +1,21 @@
- # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- # SPDX-License-Identifier: Apache-2.0.
-
- -set(LIBRARY_DIRECTORY lib)
- -set(RUNTIME_DIRECTORY bin)
- +if(DEFINED CMAKE_INSTALL_LIBDIR)
- + set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
- +else()
- + set(LIBRARY_DIRECTORY lib)
- +endif()
- +
- +if(DEFINED CMAKE_INSTALL_BINDIR)
- + set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
- +else()
- + set(RUNTIME_DIRECTORY bin)
- +endif()
- +
- # Set the default lib installation path on GNU systems with GNUInstallDirs
- if (UNIX AND NOT APPLE)
- include(GNUInstallDirs)
- - set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
- - set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
-
- # this is the absolute dumbest thing in the world, but find_package won't work without it
- # also I verified this is correctly NOT "lib64" when CMAKE_C_FLAGS includes "-m32"
- --- 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
- +++ aws-iot-device-sdk-cpp-v2/crt/aws-crt-cpp/crt/aws-checksums/cmake/AwsSharedLibSetup.cmake 2021-04-19 09:35:03.311355400 -0500
- @@ -1,13 +1,21 @@
- # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- # SPDX-License-Identifier: Apache-2.0.
-
- -set(LIBRARY_DIRECTORY lib)
- -set(RUNTIME_DIRECTORY bin)
- +if(DEFINED CMAKE_INSTALL_LIBDIR)
- + set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
- +else()
- + set(LIBRARY_DIRECTORY lib)
- +endif()
- +
- +if(DEFINED CMAKE_INSTALL_BINDIR)
- + set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
- +else()
- + set(RUNTIME_DIRECTORY bin)
- +endif()
- +
- # Set the default lib installation path on GNU systems with GNUInstallDirs
- if (UNIX AND NOT APPLE)
- include(GNUInstallDirs)
- - set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
- - set(RUNTIME_DIRECTORY ${CMAKE_INSTALL_BINDIR})
-
- # this is the absolute dumbest thing in the world, but find_package won't work without it
- # also I verified this is correctly NOT "lib64" when CMAKE_C_FLAGS includes "-m32"
|