fix submission in nightlies

(cherry picked from commit bc1f5d2)
qgis · Mar 26, 2021 · f3effb6 · f3effb6
1 parent d70f262
commit f3effb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/debian/rules b/debian/rules
@@ -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/ \

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -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%

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -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 ^