Merging r37437 through r37478 from trunk into soc-2011-tomato
[blender.git] / CMakeLists.txt
index 77c3cf01d8f9067bba8afc9c2f1dc6b111c4f383..5b2caf4c9f9cf3a50916bd0928a88d4ab693e70f 100644 (file)
@@ -226,9 +226,6 @@ if(WITH_PYTHON_MODULE)
        set(WITH_HEADLESS ON)
 endif()
 
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
 TEST_SSE_SUPPORT()
 
 #-----------------------------------------------------------------------------
@@ -237,6 +234,9 @@ TEST_SSE_SUPPORT()
 # linux only, not cached
 set(WITH_BINRELOC OFF)
 
+# MAXOSX only, set to avoid uninitialized 
+set(EXETYPE "")
+
 # these are added to later on.
 set(C_WARNINGS "")
 set(CXX_WARNINGS "")