Commit d44ccc8b authored by jcfr's avatar jcfr
Browse files

BUG: Update launch.tcl.in to update properly QT_PLUGIN_PATH with...

BUG: Update launch.tcl.in to update properly QT_PLUGIN_PATH with ConfigurationType (Debug, Release, ..) when required.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@12082 3bd1e089-480b-0410-8dfb-8563597acbee
parent 324e6716
......@@ -574,13 +574,7 @@ SET(Slicer3_QT_PLUGIN_PATH "")
IF(Slicer3_USE_QT)
SET(designer_launcher_project_name SlicerQT)
GET_TARGET_PROPERTY(output_directory ${designer_launcher_project_name} LIBRARY_OUTPUT_DIRECTORY)
IF(CMAKE_CONFIGURATION_TYPES)
SET(config ${CMAKE_BUILD_TYPE})
SET(Slicer3_QT_PLUGIN_PATH ${output_directory}/${config})
ELSE()
SET(Slicer3_QT_PLUGIN_PATH ${output_directory})
ENDIF()
SET(Slicer3_QT_PLUGIN_PATH ${output_directory})
ENDIF(Slicer3_USE_QT)
CONFIGURE_FILE(
......
......@@ -277,6 +277,7 @@ proc launch_SetEnvironment {} {
set ::Teem_BUILD_SUBDIR ""
set ::OpenIGTLink_BUILD_SUBDIR ""
set ::BatchMake_BUILD_SUBDIR ""
set ::QtDesignerPlugins_BUILD_SUBDIR ""
if {$::env(BUILD) == $::WINDOWS} {
foreach buildType {"." Debug RelWithDebInfo Release MinSizeRel} {
......@@ -304,6 +305,11 @@ proc launch_SetEnvironment {} {
if { [file exists "@BatchMake_DIR@/bin/$buildType/BatchMake.dll"] } {
set ::BatchMake_BUILD_SUBDIR $buildType
}
if { "@Slicer3_QT_PLUGIN_PATH@" != "" } {
if { [file exists "@Slicer3_QT_PLUGIN_PATH@/designer/$buildType/qCTKWidgetsPlugin.dll"] } {
set ::QtDesignerPlugins_BUILD_SUBDIR $buildType
}
}
}
} else {
set ::Slicer3_REAL $::Slicer3_HOME/bin/Slicer3-real
......@@ -400,7 +406,7 @@ proc launch_SetEnvironment {} {
# QtDesigner variable
StoreDirInEnvVar Slicer3_QT_PLUGIN_PATH "@Slicer3_QT_PLUGIN_PATH@"
StoreDirInEnvVar Slicer3_QT_PLUGIN_PATH "@Slicer3_QT_PLUGIN_PATH@/$::QtDesignerPlugins_BUILD_SUBDIR"
}
......
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