Commit 5f65a11f authored by jcfr's avatar jcfr
Browse files

COMP: Designer.py - Fix loading of qMRMLWidgets plugins

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15809 3bd1e089-480b-0410-8dfb-8563597acbee
parent 48fa15d5
...@@ -883,12 +883,7 @@ INSTALL(DIRECTORY ...@@ -883,12 +883,7 @@ INSTALL(DIRECTORY
# let's build the launcher for Kww, KwwAndQt and also QtOnly slicer ... # let's build the launcher for Kww, KwwAndQt and also QtOnly slicer ...
ADD_SUBDIRECTORY(Utilities/Launcher) ADD_SUBDIRECTORY(Utilities/Launcher)
# Compute Slicer_QT_PLUGIN_PATH used to configure launch.tcl.in
SET(Slicer_QT_PLUGIN_PATH "")
IF(Slicer_USE_QT) IF(Slicer_USE_QT)
SET(designer_launcher_project_name SlicerQT)
GET_TARGET_PROPERTY(output_directory ${designer_launcher_project_name} LIBRARY_OUTPUT_DIRECTORY)
SET(Slicer_QT_PLUGIN_PATH ${output_directory})
# on Mac we need to include the path of each Qt Framework in DYLD_LIBRARY_PATH in the launcher. # on Mac we need to include the path of each Qt Framework in DYLD_LIBRARY_PATH in the launcher.
IF(APPLE) IF(APPLE)
......
...@@ -14,7 +14,7 @@ def startDesigner(open_command, argv): ...@@ -14,7 +14,7 @@ def startDesigner(open_command, argv):
"Start QT Designer" "Start QT Designer"
addEnvVariable('QT_PLUGIN_PATH', toCygwinPath('@CTK_QTDESIGNERPLUGINS_DIR@')) addEnvVariable('QT_PLUGIN_PATH', toCygwinPath('@CTK_QTDESIGNERPLUGINS_DIR@'))
addEnvVariable('QT_PLUGIN_PATH', toCygwinPath('@LIBRARY_OUTPUT_DIRECTORY@')) addEnvVariable('QT_PLUGIN_PATH', toCygwinPath('@CMAKE_LIBRARY_OUTPUT_DIRECTORY@'))
openCmd = open_command+'@QT_BINARY_DIR@'+os.sep+argv[0] openCmd = open_command+'@QT_BINARY_DIR@'+os.sep+argv[0]
print openCmd print openCmd
os.system(openCmd + " " + argv[1]) os.system(openCmd + " " + argv[1])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment