mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-16 11:55:27 -05:00
ef0c65969b
* gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch, gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch, gnu/packages/patches/aws-sdk-cpp-disable-werror.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/cpp.scm (aws-sdk-cpp): Update to 1.9.92. [source]: Use patches. [inputs, propagated-inputs]: Update AWS dependencies to Common Runtime. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
18 lines
926 B
Diff
18 lines
926 B
Diff
--- 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
|