[cpack_installer] added check for desired cmake version to be at least greater than minimum required plus minor cleanup
This commit is contained in:
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user