Merge pull request #13705 from mantidproject/clear_cmake_v3_warnings

Clear all warnings when run under CMake >= v3.0
mantidproject · Sep 18, 2015 · 0140717 · 0140717
2 parents ac5f264 + d045b61
commit 0140717
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 117 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -1,8 +1,3 @@
-# Print a warning about ctest if using v2.6
-if ( CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8 )
-  message ( WARNING " Running tests via CTest will not work with this version of CMake. If you need this functionality, upgrade to CMake 2.8." )
-endif ()
-
 # Include useful utils
 include ( MantidUtils )
 
@@ -251,7 +246,7 @@ endif ()
 ###########################################################################
 if ( CMAKE_COMPILER_IS_GNUCXX )
   include ( GNUSetup )
-elseif ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+elseif ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
   # Remove once clang warnings have been fixed.
   if ( NOT APPLE)
     include ( GNUSetup )

diff --git a/Code/Mantid/Build/CMake/FindGMock.cmake b/Code/Mantid/Build/CMake/FindGMock.cmake
@@ -7,7 +7,7 @@
 # everything else, stick with 1.6.0
 IF (CMAKE_COMPILER_IS_GNUCXX AND GCC_COMPILER_VERSION VERSION_GREATER "4.7")
 	set (GMOCK_VERSION "1.7.0")
-ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 	set (GMOCK_VERSION "1.7.0")
 ELSE()
 	set (GMOCK_VERSION "1.6.0")

diff --git a/Code/Mantid/Build/CMake/UseSystemQt4.cmake b/Code/Mantid/Build/CMake/UseSystemQt4.cmake
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -483,7 +483,7 @@ set ( MANTID_HDRS  src/Mantid/AlgorithmMonitor.h
 # Add Qt to the include path
 ###########################################################################
 
-include ( UseSystemQt4 )
+include ( UseQt4 )
 
 ###########################################################################
 # Do the sip generation.

diff --git a/Code/Mantid/MantidQt/CMakeLists.txt b/Code/Mantid/MantidQt/CMakeLists.txt
@@ -3,7 +3,7 @@
 ###########################################################################
 find_package ( QScintilla REQUIRED )
 
-include ( UseSystemQt4 )
+include ( UseQt4 )
 include_directories ( SYSTEM ${QWT_INCLUDE_DIR} )
 
 # Any MantidQt package can depend on API, so add the includes to the path here

diff --git a/Code/Mantid/QtPropertyBrowser/CMakeLists.txt b/Code/Mantid/QtPropertyBrowser/CMakeLists.txt
@@ -8,7 +8,7 @@ project ( QtPropertyBrowser )
 if ( NOT QT_FOUND )
   find_package( Qt4 COMPONENTS QtCore QtGui REQUIRED )
 endif ()
-include ( UseSystemQt4 )
+include ( UseQt4 )
 
 # Add the sources
 set( QTPROPERTYBROWSER_SRCS

diff --git a/Code/Mantid/Testing/Tools/CMakeLists.txt b/Code/Mantid/Testing/Tools/CMakeLists.txt
@@ -14,7 +14,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX AND GMOCK_VERSION VERSION_GREATER "1.6.0")
   string(REPLACE "-Wconversion" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 endif()
 
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
   set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers" )
 endif()
 

diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Use Qt4 as system package to avoid compiler warnings
-include ( UseSystemQt4 )
+include ( UseQt4 )
 
 add_subdirectory( QtWidgets )
diff --git a/Code/Mantid/Vates/VatesSimpleGui/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/CMakeLists.txt
@@ -1,6 +1,6 @@
 set( VSI_GLOBAL_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/test/global/scripts )
 
-include( UseSystemQt4 )
+include( UseQt4 )
 
 add_subdirectory( QtWidgets )
 include_directories( QtWidgets/inc )