szaszm commented on a change in pull request #1104:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1104#discussion_r649413324
##########
File path: cmake/BundledAzureSdkCpp.cmake
##########
@@ -16,8 +16,13 @@
# under the License.
function(use_bundled_libazure SOURCE_DIR BINARY_DIR)
- set(PATCH_FILE
"${SOURCE_DIR}/thirdparty/azure-sdk-cpp-for-cpp/azure-sdk-for-cpp-old-compiler.patch")
- set(PC "${Patch_EXECUTABLE}" -R -p1 -s -f --dry-run -i "${PATCH_FILE}" ||
"${Patch_EXECUTABLE}" -p1 -i "${PATCH_FILE}")
+ set(PATCH_FILE1
"${SOURCE_DIR}/thirdparty/azure-sdk-cpp-for-cpp/azure-sdk-for-cpp-old-compiler.patch")
+ set(PATCH_FILE2
"${SOURCE_DIR}/thirdparty/azure-sdk-cpp-for-cpp/fix-illegal-qualified-name-in-member.patch")
+ set(PC bash -c "set -x && (\"${Patch_EXECUTABLE}\" -p1 -N -i
\"${PATCH_FILE1}\" &&\
+ \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE2}\") ||\
+ (\"${Patch_EXECUTABLE}\" -p1 -R --dry-run -i \"${PATCH_FILE1}\" &&\
+ \"${Patch_EXECUTABLE}\" -p1 -R --dry-run -i \"${PATCH_FILE2}\")")
Review comment:
I agree that your version might be easier to follow, so I've applied
your suggestion. Thanks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
