Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
fix submission in nightlies
(cherry picked from commit bc1f5d2)
- Loading branch information
|
@@ -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/ \ |
|
|
|
@@ -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% |
|
|
|
@@ -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 ^ |
|
|