Re #11756. Done MantidQt

mantidproject · May 19, 2015 · 5a18e4c · 5a18e4c
1 parent 53679b9
commit 5a18e4c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/Code/Mantid/MantidQt/Factory/CMakeLists.txt b/Code/Mantid/MantidQt/Factory/CMakeLists.txt
@@ -44,7 +44,14 @@ if (OSX_VERSION VERSION_GREATER 10.8)
 endif ()
 
 # ... and links to other required libs
-target_link_libraries ( MantidQtFactory LINK_PRIVATE MantidQtAPI MantidQtSliceViewer ${QT_LIBRARIES} ${QWT_LIBRARIES} )
+target_link_libraries ( MantidQtFactory LINK_PRIVATE 
+		MantidQtAPI 
+		MantidQtSliceViewer
+		${CORE_MANTIDLIBS}
+		${POCO_LIBRARIES}
+		${Boost_LIBRARIES}
+		${QT_LIBRARIES} 
+		${QWT_LIBRARIES} )
 
 ###########################################################################
 # Installation settings

diff --git a/Code/Mantid/MantidQt/Python/CMakeLists.txt b/Code/Mantid/MantidQt/Python/CMakeLists.txt
@@ -88,8 +88,16 @@ endif ()
 
 # ... and links to other required libs ...
 target_link_libraries ( mantidqtpython LINK_PRIVATE 
-	MantidQtAPI MantidQtSliceViewer MantidQtFactory MantidQtRefDetectorViewer
-	${QT_LIBRARIES} ${QWT_LIBRARIES}
+	MantidQtAPI 
+	MantidQtSliceViewer 
+	MantidQtFactory 
+	MantidQtRefDetectorViewer
+	MantidWidgets
+	${CORE_MANTIDLIBS}
+	${POCO_LIBRARIES}
+	${Boost_LIBRARIES}
+	${QT_LIBRARIES} 
+	${QWT_LIBRARIES}
 	${PYTHON_LIBRARIES}
 	)
 

diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -149,7 +149,14 @@ if (OSX_VERSION VERSION_GREATER 10.8)
 endif ()
 
 # ... and links to other required libs
-target_link_libraries ( MantidQtSliceViewer LINK_PRIVATE MantidQtAPI MantidWidgets ${QT_LIBRARIES} ${QWT_LIBRARIES} )
+target_link_libraries ( MantidQtSliceViewer LINK_PRIVATE 
+		MantidQtAPI 
+		MantidWidgets
+		${CORE_MANTIDLIBS}
+		${POCO_LIBRARIES}
+		${Boost_LIBRARIES}
+		${QT_LIBRARIES} 
+		${QWT_LIBRARIES} )
 
 ###########################################################################
 # Unit tests setup
@@ -170,7 +177,12 @@ if ( CXXTEST_FOUND )
   )
 
   cxxtest_add_test ( SliceViewerTest ${TEST_FILES} ${GMOCK_TEST_FILES} )
-  target_link_libraries( SliceViewerTest LINK_PRIVATE MantidQtSliceViewer DataObjects Crystal ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
+  target_link_libraries( SliceViewerTest LINK_PRIVATE 
+		MantidQtSliceViewer 
+		DataObjects 
+		Crystal 
+		${GMOCK_LIBRARIES} 
+		${GTEST_LIBRARIES} )
 
   add_dependencies( GUITests SliceViewerTest )
   # Add to the 'UnitTests' group in VS

diff --git a/Code/Mantid/MantidQt/SpectrumViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SpectrumViewer/CMakeLists.txt
@@ -83,7 +83,13 @@ if (OSX_VERSION VERSION_GREATER 10.8)
 endif ()
 # ... and links to other required libs
 target_link_libraries ( MantidQtSpectrumViewer LINK_PRIVATE 
-                        MantidQtAPI MantidWidgets ${CORE_MANTIDLIBS} ${QT_LIBRARIES} ${QWT_LIBRARIES} )
+                        MantidQtAPI 
+						MantidWidgets 
+						${CORE_MANTIDLIBS}
+						${POCO_LIBRARIES}
+						${Boost_LIBRARIES}
+						${QT_LIBRARIES} 
+						${QWT_LIBRARIES} )
 
 
 ###########################################################################