diff --git a/buildconfig/Jenkins/buildscript b/buildconfig/Jenkins/buildscript index 4ee625ef06b90b0670348bbf33f5c4f0041ea6ae..a50806ace2aca0d17da709d1cb0112c900d03dcb 100755 --- a/buildconfig/Jenkins/buildscript +++ b/buildconfig/Jenkins/buildscript @@ -181,7 +181,9 @@ fi if [[ "$BUILDPKG" == true ]]; then PACKAGINGVARS="-DPACKAGE_DOCS=ON" # Set some variables relating to the linux packages - if [[ ${ON_MACOS} != true ]]; then + if [[ "${ON_MACOS}" == true ]]; then + PACKAGINGVARS="${PACKAGINGVARS} -DCPACK_PACKAGE_SUFFIX=" + else # Use different suffix for linux builds if [[ ${JOB_NAME} == *release* ]]; then echo "Performing release build" # do nothing diff --git a/buildconfig/Jenkins/buildscript.bat b/buildconfig/Jenkins/buildscript.bat index 789b139e2701f947bf3c7fe42f3e65357b9cd6c8..912a7210aa6fd5b64c9b24c5cc1374737a96902b 100755 --- a/buildconfig/Jenkins/buildscript.bat +++ b/buildconfig/Jenkins/buildscript.bat @@ -92,9 +92,9 @@ if EXIST %BUILD_DIR% ( ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: Packaging options ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -set PACKAGE_DOCS= +set PACKAGE_OPTS= if "%BUILDPKG%" == "yes" ( - set PACKAGE_DOCS=-DPACKAGE_DOCS=ON + set PACKAGE_OPTS=-DPACKAGE_DOCS=ON -DCPACK_PACKAGE_SUFFIX= ) cd %BUILD_DIR% @@ -127,7 +127,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" ( ) else ( set VATES_OPT_VAL=ON ) -call cmake.exe -G "%CM_GENERATOR%" -DCONSOLE=OFF -DENABLE_CPACK=ON -DMAKE_VATES=%VATES_OPT_VAL% -DParaView_DIR=%PARAVIEW_DIR% -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON -DENABLE_FILE_LOGGING=OFF %PACKAGE_DOCS% .. +call cmake.exe -G "%CM_GENERATOR%" -DCONSOLE=OFF -DENABLE_CPACK=ON -DMAKE_VATES=%VATES_OPT_VAL% -DParaView_DIR=%PARAVIEW_DIR% -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON -DENABLE_FILE_LOGGING=OFF %PACKAGE_OPTS% .. if ERRORLEVEL 1 exit /B %ERRORLEVEL% :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::