[ignition-common] 01/11: Added patch for fixing cmake user defines

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch master
in repository ignition-common.

commit d3d9f2ab9cb7942d95607eebdc4fcb95fa7ca898
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed May 10 23:43:05 2017 +0000

    Added patch for fixing cmake user defines
---
 .../patches/0008_respect_cmake_user_defines.patch  | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/0008_respect_cmake_user_defines.patch b/debian/patches/0008_respect_cmake_user_defines.patch
new file mode 100644
index 0000000..8eeb9c9
--- /dev/null
+++ b/debian/patches/0008_respect_cmake_user_defines.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index e14d61b..583ea63 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -25,16 +25,18 @@ add_manpage_target()
+ # Use pkg_check_modules and fallback to manual detection
+ # (needed, at least, for MacOS)
+ 
+-# Use system installation on UNIX and Apple, and internal copy on Windows
+-if (UNIX OR APPLE)
+-  message (STATUS "Using system tinyxml2.")
+-  set (USE_EXTERNAL_TINYXML2 False)
+-elseif(WIN32)
+-  message (STATUS "Using internal tinyxml2.")
+-  set (USE_EXTERNAL_TINYXML2 False)
+-else()
+-  message (STATUS "Unknown platform, unable to configure tinyxml2.")
+-  BUILD_ERROR("Unknown platform")
++# By default use system installation on UNIX and Apple, and internal copy on Windows
++if (NOT DEFINED USE_EXTERNAL_TINYXML2)
++  if (UNIX OR APPLE)
++    message (STATUS "Using system tinyxml2.")
++    set (USE_EXTERNAL_TINYXML2 False)
++  elseif(WIN32)
++    message (STATUS "Using internal tinyxml2.")
++    set (USE_EXTERNAL_TINYXML2 False)
++  else()
++    message (STATUS "Unknown platform, unable to configure tinyxml2.")
++    BUILD_ERROR("Unknown platform")
++  endif()
+ endif()
+ 
+ if (USE_EXTERNAL_TINYXML2)
diff --git a/debian/patches/series b/debian/patches/series
index cc7a402..784d7ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005_fix_install_paths.patch
 0006_fix_pkgconfig_file.patch
 0007_missing_header.patch
+0008_respect_cmake_user_defines.patch

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