This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new a2c22001b MINIFICPP-2322 MINIFI_INCLUDE_UCRT_DLLS and
MINIFI_INCLUDE_VC_REDIST_DLLS shouldnt be mutually exclusive
a2c22001b is described below
commit a2c22001b2835fe2386a3d202af6f484c75a2ecd
Author: Martin Zink <[email protected]>
AuthorDate: Wed Apr 3 13:10:09 2024 +0200
MINIFICPP-2322 MINIFI_INCLUDE_UCRT_DLLS and MINIFI_INCLUDE_VC_REDIST_DLLS
shouldnt be mutually exclusive
Signed-off-by: Ferenc Gerlits <[email protected]>
This closes #1752
---
CMakeLists.txt | 6 +++++-
cmake/MiNiFiOptions.cmake | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 167a667ad..9d68cac75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -482,8 +482,12 @@ if(WIN32)
COMPONENT bin
)
endif()
- elseif(MINIFI_INCLUDE_VC_REDIST_MERGE_MODULES)
+ endif()
+ if(MINIFI_INCLUDE_VC_REDIST_MERGE_MODULES)
message("Creating installer with merge modules for Visual C++
Redistributable")
+ if(MINIFI_INCLUDE_VC_REDIST_DLLS)
+ message(WARNING "MINIFI_INCLUDE_VC_REDIST_MERGE_MODULES and
MINIFI_INCLUDE_VC_REDIST_DLLS are both set, only
MINIFI_INCLUDE_VC_REDIST_MERGE_MODULES will be used")
+ 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)
diff --git a/cmake/MiNiFiOptions.cmake b/cmake/MiNiFiOptions.cmake
index 560d1d37b..de2b264ed 100644
--- a/cmake/MiNiFiOptions.cmake
+++ b/cmake/MiNiFiOptions.cmake
@@ -79,8 +79,8 @@ list(APPEND STRICT_GSL_CHECKS_Values AUDIT ON DEBUG_ONLY OFF)
set_property(CACHE STRICT_GSL_CHECKS PROPERTY STRINGS
${STRICT_GSL_CHECKS_Values})
if (WIN32)
- add_minifi_option(MINIFI_INCLUDE_VC_REDIST_MERGE_MODULES "Include Visual
C++ Redistributable DLLs with the MSI generated by CPack. The resulting MSI is
not distributable under Apache 2.0." OFF)
- add_minifi_option(MINIFI_INCLUDE_VC_REDIST_DLLS "Include merge modules for
Visual C++ Redistributable with the MSI generated by CPack. The resulting MSI
is not distributable under Apache 2.0." OFF)
+ add_minifi_option(MINIFI_INCLUDE_VC_REDIST_MERGE_MODULES "Include merge
modules for Visual C++ Redistributable with the MSI generated by CPack. The
resulting MSI is not distributable under Apache 2.0." OFF)
+ add_minifi_option(MINIFI_INCLUDE_VC_REDIST_DLLS "Include Visual C++
Redistributable DLLs with the MSI generated by CPack. The resulting MSI is not
distributable under Apache 2.0." OFF)
add_minifi_option(MINIFI_INCLUDE_UCRT_DLLS "Redistribute Universal C
Runtime DLLs with the MSI generated by CPack. The resulting MSI is not
distributable under Apache 2.0." OFF)
add_minifi_option(ENABLE_WEL "Enables the suite of Windows Event Log
extensions." ON)
add_minifi_option(ENABLE_PDH "Enables PDH support." OFF)
