[med-svn] [fw4spl] 03/03: fix CMakeLists.txt and remove lintian's override

[Corentin Desfarges]

This is an automated email from the git hooks/post-receive script.

corentin-guest pushed a commit to branch master
in repository fw4spl.

commit 9677e8f45f46ab45ebe73281c1fa5024cf9a58a4
Author: Corentin Desfarges <corentin.desfarges at gmail.com>
Date:   Wed Feb 4 11:43:11 2015 +0100

    fix CMakeLists.txt and remove lintian's override
---
 debian/fw4spl.lintian-overrides     |  2 --
 debian/patches/fix_cmakelists.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/debian/fw4spl.lintian-overrides b/debian/fw4spl.lintian-overrides
deleted file mode 100644
index 47baa0e..0000000
--- a/debian/fw4spl.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-fw4spl: postinst-has-useless-call-to-ldconfig
-fw4spl: postrm-has-useless-call-to-ldconfig
diff --git a/debian/patches/fix_cmakelists.patch b/debian/patches/fix_cmakelists.patch
new file mode 100644
index 0000000..2a03988
--- /dev/null
+++ b/debian/patches/fix_cmakelists.patch
@@ -0,0 +1,30 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,9 +8,9 @@
+ include(CheckVariableExists)
+ include(CMakeParseArguments)
+ 
+-option(CLASSIC_INSTALL ON)
+-#set(CLASSIC_INSTALL OFF)
++option(CLASSIC_INSTALL "Build fw4spl with classic mode" OFF)
+ set( EXTERNAL_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/ )
++set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/ )
+ 
+ if(CLASSIC_INSTALL)
+     set( LIBRARY_OUTPUT_DIR "lib" )
+@@ -597,6 +597,7 @@
+ endif(EXTERNAL_LIBRARIES)
+ 
+ 
++if(CLASSIC_INSTALL)
+ set(PROJECTS_TO_BUILD CACHE STRING 
+         "List of projects that will be configured for build.
+         Leave empty to configure all projects"
+@@ -605,6 +606,7 @@
+ set(PROJECTS_TO_INSTALL CACHE STRING 
+         "List of projects for which the installation rules will be created."
+     )
++endif(CLASSIC_INSTALL)
+ 
+ 
+ file(GLOB_RECURSE PROJECTS_PROPERTIES */Properties.cmake)
diff --git a/debian/patches/series b/debian/patches/series
index 548548a..49ca987 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ change_launcher_name.patch
 remove_fwItkIOTest.patch
 set_media_as_bundle.patch
 fix_unit_tests.patch
+fix_cmakelists.patch
diff --git a/debian/rules b/debian/rules
index e58d183..fbc7ba7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ DEB_BUILD_OPTIONS="parallel=8"
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure || dh_auto_configure
+	dh_auto_configure
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/fw4spl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git