Rationalise include directory additions to remove a Mac compiler warn…

…ing (and be cleaner). Re #3868.
mantidproject · Oct 26, 2011 · cffb451 · cffb451
1 parent 6c0af16
commit cffb451
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/Code/Mantid/MantidQt/API/CMakeLists.txt b/Code/Mantid/MantidQt/API/CMakeLists.txt
@@ -44,7 +44,6 @@ set ( UI_FILES inc/MantidQtAPI/ManageUserDirectories.ui
 )
 
 include_directories ( inc )
-include_directories ( ${QWT_INCLUDE_DIR} )
 include_directories ( ../MantidWidgets/inc )
 include_directories ( ../MantidWidgets )
 

diff --git a/Code/Mantid/MantidQt/CMakeLists.txt b/Code/Mantid/MantidQt/CMakeLists.txt
@@ -2,6 +2,7 @@
 # Now add the packages one-by-one, building up the dependencies as we go
 ###########################################################################
 
+include_directories ( SYSTEM ${QWT_INCLUDE_DIR} )
 include_directories ( API/inc )
 add_subdirectory ( API )
 add_subdirectory ( MantidWidgets )
@@ -21,8 +22,9 @@ if ( MSVC_IDE )
   set_property ( TARGET CustomDialogs PROPERTY FOLDER "MantidQt" )
   set_property ( TARGET CustomInterfaces PROPERTY FOLDER "MantidQt" )
   set_property ( TARGET DesignerPlugins PROPERTY FOLDER "MantidQt" )
+  set_property ( TARGET SliceViewer PROPERTY FOLDER "MantidQt" )
 else ()
   add_custom_target ( MantidQt DEPENDS MantidQtAPI MantidWidgets 
-                                       CustomDialogs CustomInterfaces
+                                       CustomDialogs CustomInterfaces SliceViewer
   )
-endif ()
+endif ()
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -114,7 +114,6 @@ include_directories ( inc )
 include_directories ( ../MantidWidgets/inc )
 include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/../MantidWidgets )
 include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/../API )
-include_directories ( ${QWT_INCLUDE_DIR} )
 include_directories ( ../../QtPropertyBrowser/src )
 
 qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )

diff --git a/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt b/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt
@@ -84,7 +84,6 @@ set ( UI_FILES inc/MantidQtMantidWidgets/ICatAdvancedSearch.ui
 
 
 include_directories ( inc )
-include_directories ( ${QWT_INCLUDE_DIR} )
 include_directories ( ../../QtPropertyBrowser/src )
 
 qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )

diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -26,7 +26,6 @@ set ( UI_FILES
 
 
 include_directories ( inc )
-include_directories ( ${QWT_INCLUDE_DIR} )
 include_directories ( ../../QtPropertyBrowser/src )
 
 qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )