[gazebo] 02/02: Added patch to respect cmake flags
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Wed Jun 25 00:26:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository gazebo.
commit 468726e54c36aba2185006e4c07859fa2a88a384
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Wed Jun 25 00:26:23 2014 +0000
Added patch to respect cmake flags
---
debian/patches/0003-respect-cmake-c-flags.patch | 29 +++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 30 insertions(+)
diff --git a/debian/patches/0003-respect-cmake-c-flags.patch b/debian/patches/0003-respect-cmake-c-flags.patch
new file mode 100644
index 0000000..435853f
--- /dev/null
+++ b/debian/patches/0003-respect-cmake-c-flags.patch
@@ -0,0 +1,29 @@
+Description: do not unset CMAKE_C*_FLAGS
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -174,8 +174,6 @@ endif()
+
+ #####################################
+ # Handle CFlags
+-unset (CMAKE_C_FLAGS_ALL CACHE)
+-unset (CMAKE_CXX_FLAGS CACHE)
+
+ # USE_HOST_CFLAGS (default TRUE)
+ # Will check building host machine for proper cflags
+diff --git a/gazebo/rendering/skyx/CMakeLists.txt b/gazebo/rendering/skyx/CMakeLists.txt
+index 9be355e..7f3433b 100644
+--- a/gazebo/rendering/skyx/CMakeLists.txt
++++ b/gazebo/rendering/skyx/CMakeLists.txt
+@@ -47,9 +47,6 @@ set (VCLOUDS_SOURCE_FILES
+ src/VClouds/VClouds.cpp
+ )
+
+-set (CMAKE_C_FLAGS "")
+-set (CMAKE_CXX_FLAGS "")
+-
+ #set_source_files_properties(${SKYX_SOURCE_FILES} ${SKYX_HEADER_FILES}
+ # ${VCLOUDS_SOURCE_FILES} ${VCLOUDS_HEADER_FILES}
+ # PROPERTIES COMPILE_FLAGS
diff --git a/debian/patches/series b/debian/patches/series
index cc41065..34098a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-respect-linker-flags.patch
0002-install-deprecated-manpages.patch
+0003-respect-cmake-c-flags.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git
More information about the debian-science-commits
mailing list