Patch update INSTALL file

[Dirk Hohndel]

On Tue, Nov 24, 2015 at 02:37:30PM +0000, Pedro Neves wrote:
> From e55cb0e1e6fb585b39cc4343fe5a130c05f2af5e Mon Sep 17 00:00:00 2001
> From: Pedro Neves <nevesdiver at gmail.com>
> Date: Tue, 24 Nov 2015 14:29:15 +0000
> Subject: [PATCH] Update INSTALL file with Debian/Ubuntu instructions
> 
> The INSTALL file was updated to reflect the need to install qtlocation5-dev on Debian/Ubuntu systems to prevent build errors with latest master.
> 
> Signed-off-by: Pedro Neves <nevesdiver at gmail.com>
> ---
>  INSTALL                    | 2 +-
>  smtk-import/CMakeLists.txt | 2 ++
>  subsurface.desktop         | 1 +
>  3 files changed, 4 insertions(+), 1 deletion(-)
>  mode change 100644 => 100755 subsurface.desktop
> 
> diff --git a/INSTALL b/INSTALL
> index 8e832b9..32c3eba 100644
> --- a/INSTALL
> +++ b/INSTALL
> @@ -100,7 +100,7 @@ sudo apt-get install git g++ make autoconf libtool cmake pkg-config \
>  	qt5-default qt5-qmake qtchooser qttools5-dev-tools libqt5svg5-dev \
>  	libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \
>  	qtscript5-dev libssh2-1-dev libcurl4-openssl-dev qttools5-dev \
> -	qtconnectivity5-dev
> +	qtconnectivity5-dev qtlocation5-dev

So this is correct, but we of course need the corresponding packages on
the other distros as well, so I'll modify that.

> diff --git a/smtk-import/CMakeLists.txt b/smtk-import/CMakeLists.txt
> index 93fbb84..cdcb1bc 100644
> --- a/smtk-import/CMakeLists.txt
> +++ b/smtk-import/CMakeLists.txt
> @@ -1,3 +1,5 @@
> +set(CMAKE_AUTOUIC ON)
> +set(CMAKE_INCLUDE_CURRENT_DIR ON)

This is wrong (and I don't think you wanted to include this in this patch,
anyway)

We run UIC manually now as the automatic code in cmake failed for us a few
too many times. And you shouldn't need "INCLUDE_CURRENT_DIR" - if an
include file isn't found for you in the build, please post about it

(and of course - Tomaz is once again, oops, no, still completely rewriting
the Cmake infrastructure which likely means that the moment I merge those
changes all of my builds will be broken again...)

> diff --git a/subsurface.desktop b/subsurface.desktop
> old mode 100644
> new mode 100755
> index cbdcbac..dfb8d6e
> --- a/subsurface.desktop
> +++ b/subsurface.desktop
> @@ -1,3 +1,4 @@
> +#!/usr/bin/env xdg-open

Why would you need that???

/D