Re #5931. Martyn did the necessary changes.

mantidproject · Oct 10, 2012 · 458d9fc · 458d9fc
1 parent c9e8a16
commit 458d9fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -504,7 +504,7 @@ set( SRC_UNITY_IGNORE_FILES )
 # src/sipqti.cpp.rule file.
 add_custom_command ( OUTPUT ${SIP_SRC_AUTO}
                      COMMAND ${SIP_EXECUTABLE}
-                          -I ${PYQT4_SIP_DIR} ${PYQT4_SIP_FLAGS}
+                          -I ${PYQT4_SIP_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR}/../MantidQt/Python ${PYQT4_SIP_FLAGS}
                           -c ${CMAKE_CURRENT_BINARY_DIR} -j1 -w 
                           ${SIP_SPEC}
                      DEPENDS src/qti.sip ${SIP_HDRS}

diff --git a/Code/Mantid/MantidPlot/mantidplotrc.py b/Code/Mantid/MantidPlot/mantidplotrc.py
@@ -29,6 +29,10 @@ def get_default_python_api():
         return api_version
 
 if __name__ == '__main__':
+    # Import MantidPlot python commands
+    import mantidplot
+    from mantidplot import *
+
     # Make Mantid available
     from MantidFramework import *
     # Initialize the Mantid framework
@@ -50,8 +54,6 @@ def get_default_python_api():
     else:
         pass
 
-    # Import MantidPlot python commands
-    from mantidplot import *
 
     # Define a helper class for the autocomplete
     import inspect

diff --git a/Code/Mantid/MantidQt/Python/CMakeLists.txt b/Code/Mantid/MantidQt/Python/CMakeLists.txt
@@ -68,6 +68,10 @@ add_library ( mantidqtpython MODULE ${SIP_SRC} )
 if(WIN32)
 	# Windows: Python library name needs to end in .pyd for Windows
 	set_target_properties( mantidqtpython PROPERTIES PREFIX "" SUFFIX ".pyd" )
+	# Debug python library expects imported module names to end in _d
+	if ( PYTHON_DEBUG_LIBRARY )
+		set_target_properties ( mantidqtpython PROPERTIES DEBUG_OUTPUT_NAME mantidqtpython_d )
+	endif ()
 elseif ( APPLE )
 	# Mac: and in .so on the Mac, with no "lib" prefix either
   	set_target_properties ( mantidqtpython PROPERTIES PREFIX "" SUFFIX .so )