[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49553] trunk/blender/CMakeLists.txt: Revert part of r49504 by Genscher:

[Thomas Dinges]

Revision: 49553
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49553
Author:   dingto
Date:     2012-08-04 11:39:16 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Revert part of r49504 by Genscher:
* MSVC Paths were put into the MinGW block, so Mingw did not work anymore.
* Also fix paths for vc2010 libs now, so they should work now with cmake. 

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49504

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-08-04 10:47:31 UTC (rev 49552)
+++ trunk/blender/CMakeLists.txt	2012-08-04 11:39:16 UTC (rev 49553)
@@ -939,24 +939,17 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			set_lib_path(OPENEXR "openexr")
-			set_lib_path(OPENEXR_LIBPATH "openexr/lib")
-			set(OPENEXR_LIBRARIES
-				${OPENEXR_LIBPATH}/Iex.lib
-				${OPENEXR_LIBPATH}/Half.lib
-				${OPENEXR_LIBPATH}/IlmImf.lib
-				${OPENEXR_LIBPATH}/Imath.lib
-				${OPENEXR_LIBPATH}/IlmThread.lib
-			)
-			set_lib_path(OPENEXR_INCUDE "openexr/include")
-			set(OPENEXR_INCLUDE_DIRS
-				${OPENEXR_INCUDE}
-				${OPENEXR_INCUDE}/IlmImf
-				${OPENEXR_INCUDE}/Iex
-				${OPENEXR_INCUDE}/Imath
-			)
-			unset(OPENEXR_INCUDE)
-			unset(OPENEXR_LIBPATH)
+			if(MSVC10)
+				set(OPENEXR ${LIBDIR}/openexr)
+				set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/vc2010/include)
+				set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+				set(OPENEXR_LIBPATH ${OPENEXR}/vc2010/lib)
+			else()
+				set(OPENEXR ${LIBDIR}/openexr)
+				set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
+				set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+				set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+			endif()
 		endif()
 
 		if(WITH_IMAGE_TIFF)
@@ -1119,17 +1112,10 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			if(MSVC10)
-				set(OPENEXR ${LIBDIR}/openexr)
-				set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/vc_10)
-				set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
-				set(OPENEXR_LIBPATH ${OPENEXR}/lib/vc_10)
-			else()
-				set(OPENEXR ${LIBDIR}/openexr)
-				set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
-				set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
-				set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-			endif()
+			set(OPENEXR ${LIBDIR}/openexr)
+			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
+			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 		endif()
 
 		if(WITH_IMAGE_TIFF)