refs #5259. Don't distribute libs.

mantidproject · May 8, 2012 · a24898e · a24898e
1 parent b466256
commit a24898e
Show file tree

Hide file tree

Showing 43 changed files with 48 additions and 41 deletions.
diff --git a/Code/Mantid/Build/CMake/WindowsSetup.cmake b/Code/Mantid/Build/CMake/WindowsSetup.cmake
@@ -4,6 +4,11 @@
 set ( CMAKE_INCLUDE_PATH "${THIRD_PARTY}/include" )
 set ( BOOST_INCLUDEDIR "${THIRD_PARTY}/include" )
 
+##########################################################################
+# Set the SYSTEM_PACKAGE_TARGET to RUNTIME, on windows to avoid packaging libs
+###########################################################################
+set (SYSTEM_PACKAGE_TARGET RUNTIME)
+
 set (Boost_NO_SYSTEM_PATHS TRUE)
 
 if ( CMAKE_CL_64 )

diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -9,6 +9,8 @@ else()
   cmake_minimum_required ( VERSION 2.8 )
 endif ()
 
+# System package target is important for the windows builds as it allows us to package only the dlls and exes and exclude libs. Defaults to empty for other platforms.
+set ( SYSTEM_PACKAGE_TARGET "")
 
 # Add the path to our custom 'find' modules
 set ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Build/CMake")

diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -325,4 +325,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS API DESTINATION ${LIB_DIR} )
+install ( TARGETS API ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -638,4 +638,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS Algorithms DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS Algorithms ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/Framework/Crystal/CMakeLists.txt b/Code/Mantid/Framework/Crystal/CMakeLists.txt
@@ -143,4 +143,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS Crystal DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS Crystal ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
@@ -214,4 +214,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS CurveFitting DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS CurveFitting ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -381,4 +381,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS DataHandling DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS DataHandling ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/Framework/DataObjects/CMakeLists.txt b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
@@ -132,7 +132,7 @@ endif ()
 ###########################################################################
 
 if ( WIN32 )
-  install ( TARGETS DataObjects DESTINATION ${PLUGINS_DIR} )
+  install ( TARGETS DataObjects ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
 else()
   install ( TARGETS DataObjects DESTINATION ${LIB_DIR} )
 endif ()

diff --git a/Code/Mantid/Framework/Geometry/CMakeLists.txt b/Code/Mantid/Framework/Geometry/CMakeLists.txt
@@ -341,4 +341,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS Geometry DESTINATION ${LIB_DIR} )
+install ( TARGETS Geometry  ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
diff --git a/Code/Mantid/Framework/ICat/CMakeLists.txt b/Code/Mantid/Framework/ICat/CMakeLists.txt
@@ -93,4 +93,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS ICat DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS ICat ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -372,7 +372,7 @@ add_custom_command ( TARGET Kernel POST_BUILD
 # Installation settings
 ###########################################################################
 
-install ( TARGETS Kernel DESTINATION ${LIB_DIR} )
+install ( TARGETS Kernel ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
 
 # Create the properties file for the installer
 if ( APPLE )

diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -211,4 +211,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MDAlgorithms DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS MDAlgorithms ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/Framework/MDEvents/CMakeLists.txt b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
@@ -194,4 +194,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MDEvents DESTINATION ${LIB_DIR} )
+install ( TARGETS MDEvents ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
diff --git a/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt
@@ -36,4 +36,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MPIAlgorithms DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS MPIAlgorithms ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/Framework/Nexus/CMakeLists.txt b/Code/Mantid/Framework/Nexus/CMakeLists.txt
@@ -40,4 +40,4 @@ target_link_libraries ( Nexus ${MANTIDLIBS} ${NEXUS_C_LIBRARIES} )
 # Installation settings
 ###########################################################################
 
-install ( TARGETS Nexus DESTINATION ${LIB_DIR} )
+install ( TARGETS Nexus ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
diff --git a/Code/Mantid/Framework/NexusCPP/CMakeLists.txt b/Code/Mantid/Framework/NexusCPP/CMakeLists.txt
@@ -35,4 +35,4 @@ target_link_libraries ( NexusCPP ${NEXUS_C_LIBRARIES} ${POCO_LIBRARIES} )
 # Installation settings
 ###########################################################################
 
-install ( TARGETS NexusCPP DESTINATION ${LIB_DIR} )
+install ( TARGETS NexusCPP ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
diff --git a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
@@ -260,7 +260,7 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS PythonAPI DESTINATION ${BIN_DIR} )
+install ( TARGETS PythonAPI ${SYSTEM_PACKAGE_TARGET} DESTINATION ${BIN_DIR} )
 if ( UNIX )
   install ( TARGETS dlopen DESTINATION ${BIN_DIR} )
 endif ()

diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt
@@ -87,4 +87,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS WorkflowAlgorithms DESTINATION ${PLUGINS_DIR} )
+install ( TARGETS WorkflowAlgorithms ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
diff --git a/Code/Mantid/MantidQt/API/CMakeLists.txt b/Code/Mantid/MantidQt/API/CMakeLists.txt
@@ -150,7 +150,7 @@ endif () # (not for windows)
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MantidQtAPI DESTINATION ${LIB_DIR} )
+install ( TARGETS MantidQtAPI ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
 
 set ( TEST_FILES
 	test/AlgorithmRunnerTest.h

diff --git a/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt b/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt
@@ -76,4 +76,4 @@ target_link_libraries ( CustomDialogs MantidQtAPI MantidWidgets )
 # Installation settings
 ###########################################################################
 
-install ( TARGETS CustomDialogs DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
+install ( TARGETS CustomDialogs ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -142,4 +142,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS CustomInterfaces DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
+install ( TARGETS CustomInterfaces ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
diff --git a/Code/Mantid/MantidQt/Factory/CMakeLists.txt b/Code/Mantid/MantidQt/Factory/CMakeLists.txt
@@ -47,6 +47,6 @@ target_link_libraries ( MantidQtFactory MantidQtAPI QtPropertyBrowser MantidQtSl
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MantidQtFactory DESTINATION ${LIB_DIR} )
+install ( TARGETS MantidQtFactory ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
 
 
diff --git a/Code/Mantid/MantidQt/ImageViewer/CMakeLists.txt b/Code/Mantid/MantidQt/ImageViewer/CMakeLists.txt
@@ -103,6 +103,6 @@ ${QT_LIBRARIES} ${QWT_LIBRARIES} )
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MantidQtImageViewer DESTINATION ${LIB_DIR} )
+install ( TARGETS MantidQtImageViewer ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
 
 
diff --git a/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt b/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt
@@ -121,4 +121,4 @@ target_link_libraries ( MantidWidgets MantidQtAPI QtPropertyBrowser
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MantidWidgets DESTINATION ${LIB_DIR} )
+install ( TARGETS MantidWidgets ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -154,6 +154,6 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MantidQtSliceViewer DESTINATION ${LIB_DIR} )
+install ( TARGETS MantidQtSliceViewer ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
 
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/CMakeLists.txt
@@ -17,5 +17,5 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewMDEWRebinningCutterSMPlugin  ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewMDEWRebinningCutterSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewMDEWRebinningCutterSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/CMakeLists.txt
@@ -16,5 +16,5 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewRebinningTransformSMPlugin  ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewRebinningTransformSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewRebinningTransformSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/ScaleWorkspace/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/ScaleWorkspace/CMakeLists.txt
@@ -9,4 +9,4 @@ set_property( TARGET MantidParaViewScaleWorkspaceSMPlugin PROPERTY FOLDER "Manti
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewScaleWorkspaceSMPlugin  ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewScaleWorkspaceSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
+install( TARGETS MantidParaViewScaleWorkspaceSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/CMakeLists.txt
@@ -15,5 +15,5 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewSplatterPlotSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewSplatterPlotSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewSplatterPlotSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/CMakeLists.txt
@@ -15,6 +15,6 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewEventNexusReaderSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewEventNexusReaderSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewEventNexusReaderSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/CMakeLists.txt
@@ -15,6 +15,6 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewMDEWNexusReaderSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewMDEWNexusReaderSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewMDEWNexusReaderSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/CMakeLists.txt
@@ -15,6 +15,6 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewPeaksReaderSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewPeaksReaderSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewPeaksReaderSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/CMakeLists.txt
@@ -15,6 +15,6 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewSQWEventReaderSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewSQWEventReaderSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewSQWEventReaderSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWReader/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWReader/CMakeLists.txt
@@ -15,7 +15,7 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY( MantidParaViewSQWReaderSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewSQWReaderSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewSQWReaderSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
 
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/CMakeLists.txt
@@ -13,4 +13,4 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewMDEWSourceSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewMDEWSourceSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewMDEWSourceSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/CMakeLists.txt
@@ -13,4 +13,4 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewMDHWSourceSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewMDHWSourceSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewMDHWSourceSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/CMakeLists.txt
@@ -13,4 +13,4 @@ ${MANTID_SUBPROJECT_LIBS} )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewPeaksSourceSMPlugin ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewPeaksSourceSMPlugin ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewPeaksSourceSMPlugin ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/QtWidgets/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/QtWidgets/CMakeLists.txt
@@ -45,6 +45,6 @@ add_definitions( -DIN_MANTIDPARAVIEWQT_MANTIDPARAVIEWWIDGETS )
 # Put library into subfolder.
 #SET_TARGET_OUTPUT_DIRECTORY(MantidParaViewQtWidgets PVPlugins)
 
-install( TARGETS MantidParaViewQtWidgets ${TARGET_TYPE} DESTINATION ${LIB_DIR} )
+install( TARGETS MantidParaViewQtWidgets ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
 
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/RebinningCutterObjectPanel/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/RebinningCutterObjectPanel/CMakeLists.txt
@@ -21,6 +21,6 @@ MantidParaViewQtWidgets )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY( MantidParaViewRebinningCutterObjectPanel  ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewRebinningCutterObjectPanel ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewRebinningCutterObjectPanel ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
 
diff --git a/...Mantid/Vates/ParaviewPlugins/ParaViewWidgets/RebinningTransformObjectPanel/CMakeLists.txt b/...Mantid/Vates/ParaviewPlugins/ParaViewWidgets/RebinningTransformObjectPanel/CMakeLists.txt
@@ -21,6 +21,6 @@ MantidParaViewQtWidgets )
 # Put library into subfolder.
 SET_TARGET_OUTPUT_DIRECTORY( MantidParaViewRebinningTransformObjectPanel  ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR})
 
-install( TARGETS MantidParaViewRebinningTransformObjectPanel ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
+install( TARGETS MantidParaViewRebinningTransformObjectPanel ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_DIR} )
 
 
diff --git a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
@@ -187,4 +187,4 @@ if( CXXTEST_FOUND AND GMOCK_FOUND AND GTEST_FOUND )
   set_property ( TARGET VatesAPITest PROPERTY FOLDER "UnitTests" )
 endif()
 
-install( TARGETS VatesAPI ${TARGET_TYPE} DESTINATION ${LIB_DIR} )
+install( TARGETS VatesAPI ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
diff --git a/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/CMakeLists.txt
@@ -72,4 +72,4 @@ ${QWT_LIBRARIES}
 ${MANTID_SUBPROJECT_LIBS}
 )
 
-install( TARGETS VatesSimpleGuiQtWidgets ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR} )
+install( TARGETS VatesSimpleGuiQtWidgets ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR} )
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -113,4 +113,4 @@ if( SQUISH_FOUND )
 
 endif()
 
-install( TARGETS VatesSimpleGuiViewWidgets ${TARGET_TYPE} DESTINATION ${PVPLUGINS_DIR} )
+install( TARGETS VatesSimpleGuiViewWidgets ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PVPLUGINS_DIR} )