[freefoam] 05/06: Fix cmake failure.

Anton Gladky gladk at moszumanska.debian.org
Sun Sep 21 06:34:08 UTC 2014


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

gladk pushed a commit to branch master
in repository freefoam.

commit 322c00827369fdb57fb1a1f42285f8cb3d6af550
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Sep 19 21:39:05 2014 +0200

    Fix cmake failure.
---
 debian/patches/fix_cmake_failure.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/fix_cmake_failure.patch b/debian/patches/fix_cmake_failure.patch
new file mode 100644
index 0000000..2fa8a4e
--- /dev/null
+++ b/debian/patches/fix_cmake_failure.patch
@@ -0,0 +1,28 @@
+Description: fixes cmake failure
+ check, whether the list is not empty.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-09-19
+
+--- freefoam-0.1.0+dfsg+1.orig/CMake/FOAMUtilities.cmake
++++ freefoam-0.1.0+dfsg+1/CMake/FOAMUtilities.cmake
+@@ -124,12 +124,14 @@ function(foam_add_library name)
+   if(_fal_EXPORT AND _fal_SKIP_EXPORT)
+     message(FATAL_ERROR "Cannot specify both EXPORT and SKIP_EXPORT")
+   endif()
+-  list(GET _fal_DEFAULT_ARGS 0 lib_type)
+-  if(lib_type MATCHES "^(STATIC|SHARED|MODULE)$")
+-    list(REMOVE_AT _fal_DEFAULT_ARGS 0)
+-  else()
+-    set(lib_type)
+-  endif()
++  if (_fal_DEFAULT_ARGS)
++    list(GET _fal_DEFAULT_ARGS 0 lib_type)
++    if(lib_type MATCHES "^(STATIC|SHARED|MODULE)$")
++      list(REMOVE_AT _fal_DEFAULT_ARGS 0)
++    else()
++      set(lib_type)
++    endif()
++  endif (_fal_DEFAULT_ARGS)
+   # check SRCS
+   set(SRCS ${_fal_DEFAULT_ARGS})
+   set(HDRS ${_fal_PUBLIC_HEADERS})
diff --git a/debian/patches/series b/debian/patches/series
index e0358f9..cda5e45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ fix-installation-dirs-for-template-files.diff
 update-doxygen-foamheader.diff
 mips.diff
 fix_python_header.patch
+fix_cmake_failure.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefoam.git



More information about the debian-science-commits mailing list