[med-svn] [opensurgsim] 06/14: Add patch to fix Hurd builds

[Paul Novotny]

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

paulnovo-guest pushed a commit to branch master
in repository opensurgsim.

commit b5496ddac7852a3414a150ceeb240f7d63c2a19f
Author: Paul Novotny <paul at paulnovo.us>
Date:   Fri Oct 14 13:07:09 2016 -0400

    Add patch to fix Hurd builds
---
 debian/patches/fix-hurd-build.patch | 67 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 68 insertions(+)

diff --git a/debian/patches/fix-hurd-build.patch b/debian/patches/fix-hurd-build.patch
new file mode 100644
index 0000000..5ea9337
--- /dev/null
+++ b/debian/patches/fix-hurd-build.patch
@@ -0,0 +1,67 @@
+Description: Remove CMake checks on CMAKE_SYSTEM_NAME equals Linux
+ In a couple CMakeLists.txt decisions are made based on the CMAKE_SYSTEM_NAME
+ being equal to 'Linux'. For Debian GNU/Hurd this resulted in the wrong options
+ being used.
+Author: Paul Novotny <paul at paulnovo.us>
+Last-Update: 2016-10-14
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,12 +63,10 @@
+ endif(WIN32)
+ find_package(GLUT)  # only needed for visual device tests
+ find_package(GlutFromOsg)  # look for GLUT in the OSG tree if not found above
+-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-	# The standard FindGLUT code in CMake 2.8 includes some annoying old
+-	# junk (-lXmu -lXi) in GLUT_LIBRARIES for Unix/Linux, which is
+-	# neither needed nor usually available.  We only need GLUT itself.
+-	set(GLUT_LIBRARIES ${GLUT_glut_LIBRARY})
+-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++# The standard FindGLUT code in CMake 2.8 includes some annoying old
++# junk (-lXmu -lXi) in GLUT_LIBRARIES for Unix/Linux, which is
++# neither needed nor usually available.  We only need GLUT itself.
++set(GLUT_LIBRARIES ${GLUT_glut_LIBRARY})
+ 
+ if(${BUILD_SHARED_LIBS})
+ 	set(Boost_USE_STATIC_LIBS OFF)
+@@ -85,9 +83,7 @@
+ find_package(Threads REQUIRED)
+ # Append pthread and rt to Boost_LIBRARIES since they are boost dependancies
+ list(APPEND Boost_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-	list(APPEND Boost_LIBRARIES rt)
+-endif()
++list(APPEND Boost_LIBRARIES rt)
+ 
+ find_package(yaml-cpp 0.5.2 QUIET)
+ if(yaml-cpp_FOUND)
+--- a/SurgSim/Devices/MultiAxis/CMakeLists.txt
++++ b/SurgSim/Devices/MultiAxis/CMakeLists.txt
+@@ -13,11 +13,6 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-else(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-	find_package(WDK REQUIRED)
+-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-
+ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+ if(WDK_FOUND)
+@@ -88,13 +83,8 @@
+ 	win32/WdkHidDeviceHandle.h
+ )
+ 
+-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-	list(APPEND MULTIAXIS_DEVICE_SOURCES ${MULTIAXIS_DEVICE_LINUX_SOURCES})
+-	list(APPEND MULTIAXIS_DEVICE_HEADERS ${MULTIAXIS_DEVICE_LINUX_HEADERS})
+-elseif(WDK_FOUND)
+-	list(APPEND MULTIAXIS_DEVICE_SOURCES ${MULTIAXIS_DEVICE_WDK_HID_SOURCES})
+-	list(APPEND MULTIAXIS_DEVICE_HEADERS ${MULTIAXIS_DEVICE_WDK_HID_HEADERS})
+-endif()
++list(APPEND MULTIAXIS_DEVICE_SOURCES ${MULTIAXIS_DEVICE_LINUX_SOURCES})
++list(APPEND MULTIAXIS_DEVICE_HEADERS ${MULTIAXIS_DEVICE_LINUX_HEADERS})
+ 
+ # TODO(advornik): the installation should NOT copy all the headers...
+ surgsim_add_library(
diff --git a/debian/patches/series b/debian/patches/series
index 9167b36..3219c1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix-hurd-build.patch
 fix-build-with-eigen-3-3.patch
 disable-sensitive-tests.patch

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