[Bf-blender-cvs] [7ad47ad] opensubdiv-modifier: OSX: fix compile after clew rework, include fix and whitespace cleanup

[Jens Verwiebe]

Commit: 7ad47ad52f006689934c3c0f0430228c7bc8ee95
Author: Jens Verwiebe
Date:   Mon May 26 13:05:19 2014 +0200
https://developer.blender.org/rB7ad47ad52f006689934c3c0f0430228c7bc8ee95

OSX: fix compile after clew rework, include fix and whitespace cleanup

===================================================================

M	CMakeLists.txt
M	extern/clew/include/clew.h

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88269cf..c2cca6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1640,6 +1640,7 @@ elseif(APPLE)
 		find_library(OSL_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
 		find_library(OSL_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
 		set(OPENSUBDIV_INCLUDE_DIR ${OPENSUBDIV}/include)
+		set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
 		list(APPEND OPENSUBDIV_LIBRARIES ${OSL_LIB_UTIL} ${OSL_LIB_CPU} ${OSL_LIB_GPU})
 	endif()
 
diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
index a99634f..7f758da 100644
--- a/extern/clew/include/clew.h
+++ b/extern/clew/include/clew.h
@@ -77,11 +77,16 @@ extern "C" {
     #define CL_EXTENSION_WEAK_LINK                  __attribute__((weak_import))       
     #define CL_API_SUFFIX__VERSION_1_0              AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
     #define CL_EXT_SUFFIX__VERSION_1_0              CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
-    #define CL_API_SUFFIX__VERSION_1_1              CL_EXTENSION_WEAK_LINK
-    #define CL_EXT_SUFFIX__VERSION_1_1              CL_EXTENSION_WEAK_LINK
     #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+	#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+	#define CL_API_SUFFIX__VERSION_1_1              CL_EXTENSION_WEAK_LINK
+	#define CL_EXT_SUFFIX__VERSION_1_1              CL_EXTENSION_WEAK_LINK
+	#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+	#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+	#define CL_API_SUFFIX__VERSION_1_2              CL_EXTENSION_WEAK_LINK
+	#define CL_EXT_SUFFIX__VERSION_1_2              CL_EXTENSION_WEAK_LINK
 #else
-    #define CL_EXTENSION_WEAK_LINK                         
+    #define CL_EXTENSION_WEAK_LINK
     #define CL_API_SUFFIX__VERSION_1_0
     #define CL_EXT_SUFFIX__VERSION_1_0
     #define CL_API_SUFFIX__VERSION_1_1