[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22107] branches/blender2.5/blender/ CMakeLists.txt: tweaks for linking openEXR on osx/ ppc - previous switch per cpu architecture was unnecessary and broke compilation

Matt Ebb matt at mke3.net
Sat Aug 1 03:39:12 CEST 2009


Revision: 22107
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22107
Author:   broken
Date:     2009-08-01 03:39:10 +0200 (Sat, 01 Aug 2009)

Log Message:
-----------
tweaks for linking openEXR on osx/ppc - previous switch per cpu architecture was unnecessary and broke compilation

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-08-01 01:32:34 UTC (rev 22106)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-08-01 01:39:10 UTC (rev 22107)
@@ -382,11 +382,7 @@
 
   SET(OPENEXR ${LIBDIR}/openexr)
   SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
-  IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-  ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(OPENEXR_LIB Iex Half IlmImf Imath)
-  ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
   SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 
   SET(LLIBS stdc++ SystemStubs)





More information about the Bf-blender-cvs mailing list