OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo...
authorJens Verwiebe <info@jensverwiebe.de>
Tue, 7 Aug 2012 10:02:34 +0000 (10:02 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Tue, 7 Aug 2012 10:02:34 +0000 (10:02 +0000)
CMakeLists.txt
intern/cycles/kernel/kernel_types.h

index 83809e2cd002e043719b62ead2a79dcf0b6a1f8a..88f0b56a0059ed3606da608eff22200c34b0aea1 100644 (file)
@@ -271,7 +271,9 @@ if(APPLE)
        endif()
        
        execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
-       if (${MAC_SYS} MATCHES 11)
+       if (${MAC_SYS} MATCHES 12)
+               set(OSX_SYSTEM 10.8)
+       elseif (${MAC_SYS} MATCHES 11)
                set(OSX_SYSTEM 10.7)
        elseif(${MAC_SYS} MATCHES 10)
                set(OSX_SYSTEM 10.6)
@@ -1478,7 +1480,7 @@ endif()
 
 
 # set the endian define
-if(MSVC)
+if(MSVC OR ${XCODE_VERSION} VERSION_GREATER 4.3) # no more ppc support in xcode > 4.3
        # for some reason this fails on msvc
        add_definitions(-D__LITTLE_ENDIAN__)
 else()
index 30d45ad111895ffa0c295635e3031e80381ca3c7..7eab2176fa6bff983c417e2e02a4acfb4c990eae 100644 (file)
@@ -61,12 +61,12 @@ CCL_NAMESPACE_BEGIN
 #endif
 
 #ifdef __KERNEL_OPENCL_APPLE__
-//#define __SVM__
-//#define __EMISSION__
-//#define __IMAGE_TEXTURES__
-//#define __HOLDOUT__
-//#define __PROCEDURAL_TEXTURES__
-//#define __EXTRA_NODES__
+#define __SVM__
+#define __EMISSION__
+#define __IMAGE_TEXTURES__
+#define __HOLDOUT__
+#define __PROCEDURAL_TEXTURES__
+#define __EXTRA_NODES__
 #endif
 
 #ifdef __KERNEL_OPENCL_AMD__