31 lines
1.1 KiB
Text
31 lines
1.1 KiB
Text
--- GUISupport/Qt/CMakeLists.txt.orig 2015-03-03 14:37:14.000000000 -0600
|
|
+++ GUISupport/Qt/CMakeLists.txt 2015-11-25 17:08:37.840001000 -0600
|
|
@@ -104,7 +104,7 @@
|
|
endif()
|
|
|
|
# This build plugin logic should just get migrated into a module I think.
|
|
-if(BUILD_SHARED_LIBS)
|
|
+if(BUILD_SHARED_LIBS AND QT_DESIGNER_PLUGIN)
|
|
set(PluginLibSrcs Q4VTKWidgetPlugin.cxx)
|
|
|
|
set(PluginMocHeaders Q4VTKWidgetPlugin.h)
|
|
@@ -124,16 +124,16 @@
|
|
|
|
# add QVTK plugin from sources
|
|
# stand-alone as it doesn't depend on QVTK library
|
|
- add_library(QVTKWidgetPlugin
|
|
+ add_library(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
|
|
SHARED
|
|
${PluginLibSrcs}
|
|
${PluginMocSrcs}
|
|
)
|
|
|
|
- set_target_properties(QVTKWidgetPlugin PROPERTIES COMPILE_DEFINITIONS QT_NO_DEBUG)
|
|
+ set_target_properties(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} PROPERTIES COMPILE_DEFINITIONS QT_NO_DEBUG)
|
|
|
|
# link with Qt libs
|
|
- vtk_module_link_libraries(QVTKWidgetPlugin ${QT_LIBRARIES})
|
|
+ vtk_module_link_libraries(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} ${QT_LIBRARIES})
|
|
|
|
# install rules
|
|
|