Makes the autotools scripts work on Mac OS X. Also hopefully makes gtest compile on Windows CE.
This commit is contained in:
		@@ -46,20 +46,8 @@
 | 
			
		||||
#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
 | 
			
		||||
#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
 | 
			
		||||
 | 
			
		||||
#if defined(__APPLE__) && !defined(GTEST_NOT_MAC_FRAMEWORK_MODE)
 | 
			
		||||
// When using Google Test on the Mac as a framework, all the includes will be
 | 
			
		||||
// in the framework headers folder along with gtest.h.
 | 
			
		||||
// Define GTEST_NOT_MAC_FRAMEWORK_MODE if you are building Google Test on
 | 
			
		||||
// the Mac and are not using it as a framework.
 | 
			
		||||
// More info on frameworks available here:
 | 
			
		||||
// http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/
 | 
			
		||||
// Concepts/WhatAreFrameworks.html.
 | 
			
		||||
#include "gtest-string.h"  // NOLINT
 | 
			
		||||
#include "gtest-internal.h"  // NOLINT
 | 
			
		||||
#else
 | 
			
		||||
#include <gtest/internal/gtest-string.h>
 | 
			
		||||
#include <gtest/internal/gtest-internal.h>
 | 
			
		||||
#endif  // defined(__APPLE__) && !defined(GTEST_NOT_MAC_FRAMEWORK_MODE)
 | 
			
		||||
 | 
			
		||||
namespace testing {
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user