am-c-p-p commented on a change in pull request #739: MINIFICPP-1163 Implemented.
URL: https://github.com/apache/nifi-minifi-cpp/pull/739#discussion_r380558948
##########
File path: CMakeLists.txt
##########
@@ -543,23 +543,30 @@ if(WIN32)
list(REVERSE VCRUNTIME_REDIST_VERSIONS)
list(GET VCRUNTIME_REDIST_VERSIONS 0 VCRUNTIME_REDIST_DIR)
endif()
- file(GLOB VCRUNTIME_X86_MERGEMODULES
"${VCRUNTIME_REDIST_DIR}/MergeModules/Microsoft_VC*_CRT_x86.msm")
- file(GLOB VCRUNTIME_X64_MERGEMODULES
"${VCRUNTIME_REDIST_DIR}/MergeModules/Microsoft_VC*_CRT_x64.msm")
- if (NOT VCRUNTIME_X86_MERGEMODULES OR NOT VCRUNTIME_X64_MERGEMODULES)
- message(FATAL_ERROR "Could not find the VC Redistributable
Merge Modules. Please set VCRUNTIME_X86_MERGEMODULE_PATH and
VCRUNTIME_X64_MERGEMODULE_PATH manually!")
- else()
- list(GET VCRUNTIME_X86_MERGEMODULES 0
VCRUNTIME_X86_MERGEMODULE_PATH)
- list(GET VCRUNTIME_X64_MERGEMODULES 0
VCRUNTIME_X64_MERGEMODULE_PATH)
+
+ file(GLOB VCRUNTIME_X86_REDIST_CRT_DIR
"${VCRUNTIME_REDIST_DIR}/x86/Microsoft.VC141.CRT")
+ file(GLOB VCRUNTIME_X64_REDIST_CRT_DIR
"${VCRUNTIME_REDIST_DIR}/x64/Microsoft.VC141.CRT")
+
+ if (NOT VCRUNTIME_X86_REDIST_CRT_DIR OR NOT
VCRUNTIME_X64_REDIST_CRT_DIR)
+ message(FATAL_ERROR "Could not find the VC Redistributable.
Please set VCRUNTIME_X86_REDIST_CRT_DIR and VCRUNTIME_X64_REDIST_CRT_DIR
manually!")
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- message("Using ${VCRUNTIME_X64_MERGEMODULE_PATH} VC
Redistributable Merge Module")
- configure_file("msi/x64.wsi" "msi/x64.wsi" @ONLY)
- set(CPACK_WIX_EXTRA_SOURCES
"${CMAKE_CURRENT_BINARY_DIR}/msi/x64.wsi")
+ message("Using ${VCRUNTIME_X64_REDIST_DIR} VC Redistributables")
Review comment:
Fixed.
----------------------------------------------------------------
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]
With regards,
Apache Git Services
