[med-svn] [fw4spl] 07/08: Fix build with 11.0.4

[Flavien Bridault]

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

fbridault-guest pushed a commit to branch master
in repository fw4spl.

commit d64a76a4ef65bb8d7700af0054ad78f5d1a111ae
Author: Flavien Bridault <fbridault at ircad.fr>
Date:   Wed Mar 1 17:53:48 2017 +0100

    Fix build with 11.0.4
---
 debian/patches/fix_install.patch | 39 ++++++++++++++++++++++++++++++++++++++-
 debian/rules                     |  2 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/debian/patches/fix_install.patch b/debian/patches/fix_install.patch
index 53d561d..898ebe7 100644
--- a/debian/patches/fix_install.patch
+++ b/debian/patches/fix_install.patch
@@ -105,7 +105,16 @@ Author: Flavien Bridault <fbridault at ircad.fr>
  include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/profile_config.cmake)
  include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/plugin_config.cmake)
  include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/install/generic_install.cmake)
-@@ -95,12 +96,14 @@
+@@ -52,6 +53,8 @@
+ 
+ set(ENABLE_PCH ON CACHE BOOL "Use pre-compiled headers to speedup the compilation")
+ 
++set(FWCMAKE_RESOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake/)
++
+ # Append our 'FindPackages.cmake' to CMAKE_MODULE_PATH
+ if(EXTERNAL_LIBRARIES)
+ 
+@@ -95,12 +98,14 @@
      endforeach()
  endif()
  
@@ -121,6 +130,15 @@ Author: Flavien Bridault <fbridault at ircad.fr>
  else()
      set(BUNDLE_PREFIX "Bundles")
  endif()
+@@ -137,8 +142,6 @@
+ 
+ set(LIBRARY_OUTPUT_DIR lib)
+ 
+-set(FWCMAKE_RESOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake/)
+-
+ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+     #http://stackoverflow.com/questions/6802903/c-ifdef-mac-os-x-question
+     add_definitions(-D__MACOSX__) #racy backward compatibility
 @@ -177,6 +180,7 @@
  endif()
  
@@ -262,3 +280,22 @@ Author: Flavien Bridault <fbridault at ircad.fr>
  }
  
  //------------------------------------------------------------------------------
+--- fw4spl.orig/Bundles/style/CMakeLists.txt
++++ fw4spl/Bundles/style/CMakeLists.txt
+@@ -2,6 +2,8 @@
+ 
+ find_package(Qt5 COMPONENTS Core REQUIRED)
+ 
++file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${BUNDLE_PREFIX}/${FWPROJECT_NAME}_${DASH_VERSION}")
++
+ qt5_add_binary_resources(${FWPROJECT_NAME}_DARKSTYLE_RCC 
+     "rc/darkstyle.qrc" 
+     DESTINATION "${CMAKE_BINARY_DIR}/${BUNDLE_PREFIX}/${FWPROJECT_NAME}_${DASH_VERSION}/darkstyle.rcc"
+--- fw4spl.orig/Bundles/LeafUI/uiGenericQt/CMakeLists.txt
++++ fw4spl/Bundles/LeafUI/uiGenericQt/CMakeLists.txt
+@@ -18,4 +18,5 @@
+ 
+ set_target_properties(${FWPROJECT_NAME} PROPERTIES AUTOMOC TRUE)
+ 
++target_compile_definitions(${FWPROJECT_NAME} PUBLIC "-DQT_NO_KEYWORDS")
+ 
diff --git a/debian/rules b/debian/rules
index 03b012a..1a76837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DDEBIAN_INSTALL=ON -DUSE_SYSTEM_LIB=ON -DPROJECTS_TO_BUILD="VRRender" -DPROJECTS_TO_INSTALL="VRRender" -DCMAKE_INSTALL_RPATH="/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl" -Wno-dev
+	dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DDEBIAN_INSTALL=ON -DUSE_SYSTEM_LIB=ON -DPROJECTS_TO_BUILD="VRRender" -DPROJECTS_TO_INSTALL="VRRender" -DCMAKE_INSTALL_RPATH="/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl" -Wno-dev -DENABLE_PCH=OFF -DBUILD_TESTS=OFF
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/fw4spl

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