From 7817d6c79a2c169eb90714c1a05745d208e8ad32 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Wed, 30 Apr 2014 23:47:38 -0700
Subject: [PATCH] Support for C++11 on OSX
---
CMakeLists.txt | 5 ++---
src/common/common.h | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6837d36fd..07a04c2c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,9 +21,8 @@ pkg_search_module(GLFW REQUIRED glfw3)
IF (APPLE)
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
- SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
- SET(CMAKE_CXX_FLAGS_DEBUG "-stdlib=libc++")
- SET(CMAKE_CXX_FLAGS_RELEASE "-stdlib=libc++")
+ SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
+ SET(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++")
ENDIF (APPLE)
#external includes
diff --git a/src/common/common.h b/src/common/common.h
index 30a6761b7..2578d0010 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -25,7 +25,7 @@
#define HAVE_CXX11_SYNTAX 1
#endif
-//#if HAVE_CXX11_SYNTAX
+#if HAVE_CXX11_SYNTAX
// An inheritable class to disallow the copy constructor and operator= functions
class NonCopyable
{
@@ -37,7 +37,7 @@ private:
NonCopyable(NonCopyable&);
NonCopyable& operator=(NonCopyable& other);
};
-//#endif
+#endif
#include "common/log.h"
#include "common/common_types.h"