Skip to content

Commit

Permalink
Refs #10363. silence warnings from glu* and openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
quantumsteve committed Oct 14, 2014
1 parent 4ff4f2f commit cd013ec
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions Code/Mantid/Build/CMake/DarwinSetup.cmake
Expand Up @@ -84,6 +84,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -std=c++0x" )
set ( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x" )

if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++" )
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register" )
set ( CMAKE_XCODE_ATTRIBUTE_OTHER_CPLUSPLUSFLAGS "-Wno-deprecated-register")
set ( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++" )
Expand Down Expand Up @@ -120,8 +121,16 @@ if (OSX_VERSION VERSION_LESS 10.9)
set ( SITEPACKAGES /Library/Python/${PY_VER}/site-packages )
else()
# Assume we are using homebrew for now
# set Deployment target to 10.8
set ( CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk )
set ( CMAKE_OSX_ARCHITECTURES x86_64 )
set ( CMAKE_OSX_DEPLOYMENT_TARGET 10.8 )
set ( PYQT4_PYTHONPATH /usr/local/lib/python${PY_VER}/site-packages/PyQt4 )
set ( SITEPACKAGES /usr/local/lib/python${PY_VER}/site-packages )
# use homebrew OpenSSL package
EXEC_PROGRAM( brew ARGS info openssl | grep openssl: | cut -c 17-22 OUTPUT_VARIABLE _openssl_version )
MESSAGE(STATUS "OpenSSL version: ${_openssl_version}")
set ( OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/${_openssl_version}/ )
endif()

# Python packages
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/Algorithms/test/MultiplyDivideTest.in.h
@@ -1,4 +1,4 @@
#ifndef @MULTIPLYDIVIDETEST_CLASS@_H
#ifndef @MULTIPLYDIVIDETEST_CLASS@_H_
#define @MULTIPLYDIVIDETEST_CLASS@_H_

#include <cxxtest/TestSuite.h>
Expand Down Expand Up @@ -980,4 +980,4 @@ class @MULTIPLYDIVIDETEST_CLASS@ : public CxxTest::TestSuite
};


#endif /*MULTIPLYTEST_H_ or DIVIDETEST_H*/
#endif /*MULTIPLYTEST_H_ or DIVIDETEST_H_*/

0 comments on commit cd013ec

Please sign in to comment.