diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-18 14:33:09 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-18 14:37:26 +0000 |
| commit | e486b2b674badc80627b11077b7df2ac1cab92d8 (patch) | |
| tree | 5909547a69c4b185b878c8f0fe8152f1c01fef04 /gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch | |
| parent | 0df1eb029efe5ebe3f02e36fa650cae4aaba89ec (diff) | |
| parent | 88badc074a5dbebf80115918cf6c0009075154d2 (diff) | |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch')
| -rw-r--r-- | gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch b/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch new file mode 100644 index 0000000000..efc1218834 --- /dev/null +++ b/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,9 +98,13 @@ set(PYTHON_CMD "python") + # CMAKE_MODULE_PATH is a CMAKE variable. It contains a list of paths + # which could be used to search CMAKE modules by "include()" or "find_package()", but the default value is empty. + # Add ${CMAKE_INSTALL_LIBDIR}/cmake and ${CMAKE_PREFIX_PATH}/lib/cmake to search list ++if (DEFINED ENV{CMAKE_PREFIX_PATH}) ++ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) ++endif() ++ + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") +-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake") +-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}") ++set(AWS_MODULE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake") ++string(REPLACE ":" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}") + list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH}) + + # include() will "load and run" cmake script |