Revert part of r49504 by Genscher:
authorThomas Dinges <blender@dingto.org>
Sat, 4 Aug 2012 11:39:16 +0000 (11:39 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 4 Aug 2012 11:39:16 +0000 (11:39 +0000)
* 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.

CMakeLists.txt

index 299244b119e90d29201d1c8f5e993e05b31b1f73..eb29df7d341d88ce09071dba16dc53b4fe8c8d22 100644 (file)
@@ -939,24 +939,17 @@ elseif(WIN32)
                endif()
 
                if(WITH_IMAGE_OPENEXR)
                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)
                endif()
 
                if(WITH_IMAGE_TIFF)
@@ -1119,17 +1112,10 @@ elseif(WIN32)
                endif()
 
                if(WITH_IMAGE_OPENEXR)
                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)
                endif()
 
                if(WITH_IMAGE_TIFF)