Revise qgis-master

OpenOrienteering · Sep 16, 2020 · 2e06619 · 2e06619
1 parent 15d3d04
commit 2e06619
Showing 1 changed file with 2 additions and 29 deletions.
diff --git a/qgis-master.cmake b/qgis-master.cmake
@@ -27,18 +27,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# https://tracker.debian.org/pkg/gdal
+# https://tracker.debian.org/pkg/qgis
 
 set(version        master)
-set(download_hash  SHA256=a06b47271827892f1897464c04a2a484f682f930d96b4d0329634512e973fe29)
-set(patch_version  ${version})
-set(patch_hash     SHA256=50314f747a4813566d0005b677f83eab50c5e2b32ce23e513830724d86ae5640)
 set(base_url       https://github.com/qgis/QGIS/archive/)
 set(QGIS_QT_VERSION 5.15)
 
 superbuild_package(
   NAME           qgis
-  VERSION        ${patch_version}
+  VERSION        ${version}
   DEPENDS
     common-licenses
     gdal
@@ -55,39 +52,15 @@ superbuild_package(
 
   SOURCE
     URL            ${base_url}${version}.tar.gz
-    URL_HASH       ${download_hash}
 
-  USING            patch_version extra_cflags extra_cxxflags
   BUILD [[
     CMAKE_ARGS
       "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
       "-DCMAKE_BUILD_TYPE:STRING=$<CONFIG>"
       -DBUILD_SHARED_LIBS=ON
       -DUSE_THREAD=ON
       -DWITH_QTWEBKIT=OFF
-    $<$<NOT:$<BOOL:@CMAKE_CROSSCOMPILING@>>:
-      -DBUILD_TESTING=ON
-    >
-    $<$<BOOL:@CMAKE_CROSSCOMPILING@>:
-      -DCMAKE_PROGRAM_PATH=${HOST_DIR}/bin # for sqlite3
-      -DBUILD_TESTING=OFF
-    >
-    $<$<NOT:$<OR:$<BOOL:@CMAKE_CROSSCOMPILING@>,$<BOOL:@MSYS@>>>:
-    TEST_COMMAND
-      "${CMAKE_COMMAND}" -E env
-        "PROJ_LIB=${DESTDIR}${CMAKE_STAGING_PREFIX}/share/proj"
-        "${CMAKE_COMMAND}" --build . --target test
-    TEST_AFTER_INSTALL
-    >
     INSTALL_COMMAND
       "${CMAKE_COMMAND}" --build . --target install/strip/fast
-    COMMAND
-      "${CMAKE_COMMAND}" -E copy_directory
-        "<SOURCE_DIR>/../proj-patches-${patch_version}/data"
-        "${DESTDIR}${CMAKE_STAGING_PREFIX}/share/proj"
-    COMMAND
-      "${CMAKE_COMMAND}" -E copy
-        "<SOURCE_DIR>/../proj-patches-${patch_version}/copyright"
-        "${DESTDIR}${CMAKE_STAGING_PREFIX}/share/doc/copyright/proj-${patch_version}.txt"
   ]]
 )