diff options
Diffstat (limited to 'net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch')
-rw-r--r-- | net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch b/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch new file mode 100644 index 000000000000..cd71554b3770 --- /dev/null +++ b/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch @@ -0,0 +1,68 @@ +From 3bbf91be9f510ef999c62ae2d42a094d271299b7 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews@integralblue.com> +Date: Fri, 6 Apr 2018 14:56:44 -0400 +Subject: [PATCH 1/2] Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH + +Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH to control the path to which the executable and libraries are installed. +--- + CMakeLists.txt | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 15a2684c..66c2f6f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -535,23 +535,23 @@ target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend) + # do not install the binary if the project and install are equal + if( NOT CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR ) + install(TARGETS xmr-stak +- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") ++ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_OUTPUT_PATH}") + if(CUDA_FOUND) + if(WIN32) + install(TARGETS xmrstak_cuda_backend +- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") ++ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}") + else() + install(TARGETS xmrstak_cuda_backend +- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") ++ LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}") + endif() + endif() + if(OpenCL_FOUND) + if(WIN32) + install(TARGETS xmrstak_opencl_backend +- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") ++ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}") + else() + install(TARGETS xmrstak_opencl_backend +- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") ++ LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}") + endif() + endif() + else() + +From c1d907ee03795fdce80daba6395e2a7eb1333930 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews@integralblue.com> +Date: Fri, 6 Apr 2018 15:11:07 -0400 +Subject: [PATCH 2/2] Allow EXECUTABLE and LIBRARY paths to be set + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66c2f6f8..1ff7fbb4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -522,8 +522,8 @@ else() + add_executable(xmr-stak ${SRCFILES_CPP}) + endif() + +-set(EXECUTABLE_OUTPUT_PATH "bin") +-set(LIBRARY_OUTPUT_PATH "bin") ++set(EXECUTABLE_OUTPUT_PATH "bin" CACHE STRING "Path to place executables") ++set(LIBRARY_OUTPUT_PATH "bin" CACHE STRING "Path to place libraries") + + target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend) + |