adamdebreceni commented on a change in pull request #985:
URL: https://github.com/apache/nifi-minifi-cpp/pull/985#discussion_r567761703



##########
File path: CMakeLists.txt
##########
@@ -650,13 +650,21 @@ if(WIN32)
        if (MSI_REDISTRIBUTE_UCRT_NONASL)
                set(UCRT_DIR_NAT 
"$ENV{WindowsSdkDir}Redist\\ucrt\\DLLs\\$ENV{Platform}")
                file(TO_CMAKE_PATH "${UCRT_DIR_NAT}" UCRT_DIR)
-               message("Using UCRT from ${UCRT_DIR}")
-               file(GLOB UCRT_DLLS "${UCRT_DIR}/*.dll")
-               file(COPY ${UCRT_DLLS} DESTINATION 
"${CMAKE_CURRENT_BINARY_DIR}/ucrt")
-               install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ucrt/"
-                       DESTINATION bin
-                       COMPONENT bin
-               )
+               if (NOT EXISTS "${UCRT_DIR}")
+                       set(UCRT_DIR_NAT 
"$ENV{WindowsSdkDir}Redist\\$ENV{WindowsSDKVersion}ucrt\\DLLs\\$ENV{Platform}")

Review comment:
       in that case we should update the description of the issue, because it 
says "Microsoft allows for the redistribution of these DLLs" while the linked 
legal ticket, as you said, says otherwise




----------------------------------------------------------------
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]


Reply via email to