[med-svn] [fw4spl] 01/01: fix cmakelists (2)

[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 a15dbd90a83fe604950123f07e9c4ebf0e81de8b
Author: Corentin Desfarges <corentin.desfarges at gmail.com>
Date:   Wed Feb 4 16:47:52 2015 +0100

    fix cmakelists (2)
---
 debian/patches/fix_cmakelists.patch | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/patches/fix_cmakelists.patch b/debian/patches/fix_cmakelists.patch
index 2a03988..5a24604 100644
--- a/debian/patches/fix_cmakelists.patch
+++ b/debian/patches/fix_cmakelists.patch
@@ -1,3 +1,9 @@
+Description: Fix CMake issue (CMake had to be launched twice to work)
+Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
+Forwarded: no
+Last-Update: 2015-02-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -8,9 +8,9 @@
@@ -12,7 +18,19 @@
  
  if(CLASSIC_INSTALL)
      set( LIBRARY_OUTPUT_DIR "lib" )
-@@ -597,6 +597,7 @@
+@@ -583,8 +583,10 @@
+ endmacro()
+ 
+ 
++if(CLASSIC_INSTALL)
++   set(EXTERNAL_LIBRARIES CACHE PATH "External libraries location")
++endif()
+ 
+-set(EXTERNAL_LIBRARIES CACHE PATH "External libraries location")
+ if(EXTERNAL_LIBRARIES)
+     list(APPEND CMAKE_PREFIX_PATH ${EXTERNAL_LIBRARIES})
+     list(APPEND CMAKE_MODULE_PATH ${EXTERNAL_LIBRARIES})
+@@ -597,6 +599,7 @@
  endif(EXTERNAL_LIBRARIES)
  
  
@@ -20,7 +38,7 @@
  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 @@
+@@ -605,6 +608,7 @@
  set(PROJECTS_TO_INSTALL CACHE STRING 
          "List of projects for which the installation rules will be created."
      )

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