[cpack_installer] second attempt to fix cpack selection

main
scottr 5 years ago
parent 197241f16d
commit fd8cff6aec

@ -23,10 +23,11 @@ PUSHD %OUTPUT_DIRECTORY%
REM Override the temporary directory used by wix to the EBS volume
SET "WIX_TEMP=!WORKSPACE!/temp/wix"
IF NOT EXIST "%WIX_TEMP%" (
MKDIR %WIX_TEMP%
MKDIR "WIX_TEMP%"
)
REM Make sure we are using the CMake version of CPack and not the one that comes with chocolaty
SET CMAKE_INSTALL_PATH=
IF "%LY_CMAKE_PATH%"=="" (
for /f %%i in ('where cmake') do SET "CMAKE_EXE_PATH=%%i"
for %%F in ("%CMAKE_EXE_PATH%") do SET "CMAKE_INSTALL_PATH=%%~dpF"
@ -34,6 +35,11 @@ IF "%LY_CMAKE_PATH%"=="" (
SET "CMAKE_INSTALL_PATH=%LY_CMAKE_PATH%\"
)
IF "%CMAKE_INSTALL_PATH%"=="" (
ECHO [ci_build] CPack path not found
GOTO :popd_error
)
REM Run cpack
ECHO [ci_build] "%CMAKE_INSTALL_PATH%cpack" -C %CONFIGURATION%
"%CMAKE_INSTALL_PATH%cpack" -C %CONFIGURATION%

Loading…
Cancel
Save