Page MenuHomePhabricator
Files F1144

0001-PythonQt-debug-and-release-name-clash-resolved.patch
Public
Actions

Authored By
khlebnikov
Sep 19 2015, 5:45 PM
Size
3 KB
Referenced Files
None
Subscribers
None

0001-PythonQt-debug-and-release-name-clash-resolved.patch
View Options

From 421fd6f4429e0450992c0f9bb74550d13cd58b54 Mon Sep 17 00:00:00 2001
From: Rostislav Khlebnikov <r.khlebnikov@gmail.com>
Date: Sat, 19 Sep 2015 16:42:23 +0100
Subject: [PATCH] PythonQt debug and release name clash resolved
---
CMakeExternals/CTK.cmake | 1 +
CMakeExternals/CTK.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/CMakeExternals/CTK.cmake b/CMakeExternals/CTK.cmake
index 63b3c68..c4cc2c6 100644
--- a/CMakeExternals/CTK.cmake
+++ b/CMakeExternals/CTK.cmake
@@ -106,6 +106,7 @@ if(MITK_USE_CTK)
# a non-empty CMAKE_DEBUG_POSTFIX for the plugin
# libraries yet.
-DCMAKE_DEBUG_POSTFIX:STRING=
+ -DPYTHONQT_DEBUG_POSTFIX:STRING=d # for PythonQt
-DGit_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE}
-DGIT_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE}
-DCTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON
diff --git a/CMakeExternals/CTK.patch b/CMakeExternals/CTK.patch
index 3da3ab5..d52731e 100644
--- a/CMakeExternals/CTK.patch
+++ b/CMakeExternals/CTK.patch
@@ -345,6 +345,39 @@ index c599642..9cd3454 100644
* }
* ...
* }
+diff --git a/CMakeExternals/PythonQt.cmake b/CMakeExternals/PythonQt.cmake
+index 81764e8..c07722e 100644
+--- a/CMakeExternals/PythonQt.cmake
++++ b/CMakeExternals/PythonQt.cmake
+@@ -92,6 +92,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
+ -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
+ -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2}
+ -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
++ -DCMAKE_DEBUG_POSTFIX:STRING=${PYTHONQT_DEBUG_POSTFIX}
+ ${ep_PythonQt_args}
+ DEPENDS
+ ${${proj}_DEPENDENCIES}
+@@ -111,6 +112,7 @@ mark_as_superbuild(
+ PYTHON_INCLUDE_DIR:PATH # FindPythonQt expects PYTHON_INCLUDE_DIR variable to be defined
+ PYTHON_INCLUDE_DIR2:PATH
+ PYTHON_LIBRARY:FILEPATH # FindPythonQt expects PYTHON_LIBRARY variable to be defined
++ PYTHONQT_DEBUG_POSTFIX:STRING
+ LABELS "FIND_PACKAGE_VARS"
+ )
+ mark_as_superbuild(
+diff --git a/Utilities/CMake/FindPythonQt.cmake b/Utilities/CMake/FindPythonQt.cmake
+index 5e61d97..1d3fc28 100644
+--- a/Utilities/CMake/FindPythonQt.cmake
++++ b/Utilities/CMake/FindPythonQt.cmake
+@@ -22,7 +22,7 @@ find_path(PYTHONQT_INCLUDE_DIR PythonQt.h
+ "${PYTHONQT_INSTALL_DIR}/src"
+ DOC "Path to the PythonQt include directory")
+ find_library(PYTHONQT_LIBRARY_RELEASE PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+-find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt${CTK_CMAKE_DEBUG_POSTFIX} PythonQt${CMAKE_DEBUG_POSTFIX} PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
++find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt${CTK_CMAKE_DEBUG_POSTFIX} PythonQt${CMAKE_DEBUG_POSTFIX} PythonQt${PYTHONQT_DEBUG_POSTFIX} PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+ set(PYTHONQT_LIBRARY)
+ if(PYTHONQT_LIBRARY_RELEASE)
+ list(APPEND PYTHONQT_LIBRARY optimized ${PYTHONQT_LIBRARY_RELEASE})
--
1.8.4.msysgit.0
--
1.8.4.msysgit.0

File Metadata

Mime Type
application/octet-stream
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1107
Default Alt Text
0001-PythonQt-debug-and-release-name-clash-resolved.patch (3 KB)
MITK · MIC · IMSY · DKFZ