Skip to content
Permalink
Browse files

fix submission in nightlies

(cherry picked from commit bc1f5d2)
  • Loading branch information
jef-n committed Mar 26, 2021
1 parent d70f262 commit f3effb65a91edcdfcf87dd3a480f8f1c218eaef4
Showing with 4 additions and 4 deletions.
  1. +2 −2 debian/rules
  2. +1 −2 ms-windows/osgeo4w/package-nightly.cmd
  3. +1 −0 ms-windows/osgeo4w/package.cmd
@@ -98,7 +98,8 @@ CMAKE_OPTS := \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-DPYTHON_LIBRARY=$(PYTHON_LIBRARY) \
-DDOXYGEN_ON_DEMAND=TRUE \
-DWITH_QSPATIALITE=TRUE
-DWITH_QSPATIALITE=TRUE \
-DSUBMIT_URL="https://cdash.orfeo-toolbox.org/submit.php?project=QGIS"

ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
@@ -258,7 +259,6 @@ test-stamp:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Code to run the package test suite
rm -f $(QGIS_BUILDDIR)/.error
cp -u $(QGIS_BUILDDIR)/CTestConfig.cmake .
mkdir -p debian/tmp/locale/
localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
LOCPATH=$(CURDIR)/debian/tmp/locale/ \
@@ -117,6 +117,7 @@ cmake -G "%CMAKEGEN%" ^
-D CMAKE_LINKER="%CMAKE_COMPILER_PATH:\=/%/link.exe" ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="%OSGEO4W_CXXFLAGS%" ^
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
-D SUBMIT_URL="https://cdash.orfeo-toolbox.org/submit.php?project=QGIS" ^
-D BUILDNAME="%BUILDNAME%" ^
-D SITE="%SITE%" ^
-D PEDANTIC=TRUE ^
@@ -159,8 +160,6 @@ if errorlevel 1 (echo cmake failed & goto error)

if "%CONFIGONLY%"=="1" (echo Exiting after configuring build directory: %CD% & goto end)

copy %BUILDDIR%\CTestConfig.cmake %SRCDIR%

:skipcmake
if exist ..\noclean (echo skip clean & goto skipclean)
echo CLEAN: %DATE% %TIME%
@@ -120,6 +120,7 @@ cmake -G "%CMAKEGEN%" ^
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELEASE=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
-D CMAKE_SHARED_LINKER_FLAGS_RELEASE="/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF" ^
-D CMAKE_MODULE_LINKER_FLAGS_RELEASE="/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF" ^
-D SUBMIT_URL="https://cdash.orfeo-toolbox.org/submit.php?project=QGIS" ^
-D BUILDNAME="%BUILDNAME%" ^
-D SITE="%SITE%" ^
-D PEDANTIC=TRUE ^

0 comments on commit f3effb6

Please sign in to comment.