From bc1f5d23d66b1e3de00225c3b4bb380299010f8f Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 26 Mar 2021 23:33:51 +0100 Subject: [PATCH] fix submission in nightlies --- debian/rules | 4 ++-- ms-windows/osgeo4w/package-nightly.cmd | 3 +-- ms-windows/osgeo4w/package.cmd | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 6d97c319dba..e56e6fcead3 100755 --- a/debian/rules +++ b/debian/rules @@ -103,7 +103,8 @@ CMAKE_OPTS := \ -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so \ -DWITH_HANA=TRUE \ -DWITH_PDAL=TRUE \ - -DWITH_EPT=TRUE + -DWITH_EPT=TRUE \ + -DSUBMIT_URL="https://cdash.orfeo-toolbox.org/submit.php?project=QGIS" ifneq ($(SHA),) CMAKE_OPTS += -DSHA=$(SHA) @@ -256,7 +257,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 index 4c27097e541..20091f62e7f 100644 --- 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 ^ @@ -160,8 +161,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 index 08cb754d413..00feaad3622 100644 --- 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 ^