[cpack_installer] added check for desired cmake version to be at least greater than minimum required plus minor cleanup

This commit is contained in:
scottr
2021-06-02 13:10:11 -07:00
parent a1b8d1233c
commit cfd06f2e4a
2 changed files with 10 additions and 4 deletions
@@ -12,7 +12,7 @@
set(LY_WIX_PATH "" CACHE PATH "Path to the WiX install path")
if(LY_WIX_PATH)
file(TO_CMAKE_PATH ${LY_QTIFW_PATH} CPACK_WIX_ROOT)
file(TO_CMAKE_PATH ${LY_WIX_PATH} CPACK_WIX_ROOT)
elseif(DEFINED ENV{WIX})
file(TO_CMAKE_PATH $ENV{WIX} CPACK_WIX_ROOT)
endif()
@@ -26,7 +26,7 @@ else()
return()
endif()
set(CPACK_GENERATOR "WIX")
set(CPACK_GENERATOR WIX)
set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-windows-x86_64")
set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.zip")