[Bf-committers] [Bf-blender-cvs] [0c3c49e] soc-2013-viewport_fx: fix: visual studio 2010 project built with cmake could not find libjpeg

[Campbell Barton]

Note, we've dropped support for MSVC2010, we're moving from 2008 ->
2013 for official releases.

On Sat, May 31, 2014 at 2:08 PM, Jason Wilkins <noreply at git.blender.org> wrote:
> Commit: 0c3c49eee36faebb4dedeb879a3424479d0fd8c6
> Author: Jason Wilkins
> Date:   Fri May 30 23:08:27 2014 -0500
> https://developer.blender.org/rB0c3c49eee36faebb4dedeb879a3424479d0fd8c6
>
> fix: visual studio 2010 project built with cmake could not find libjpeg
>
> ===================================================================
>
> M       CMakeLists.txt
>
> ===================================================================
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 6529673..138a300 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -1129,7 +1129,7 @@ elseif(WIN32)
>                         set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
>                 endif()
>
> -               if(MSVC90)
> +               if(MSVC90 OR MSVC10)
>                         set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
>                 endif()
>                 find_package(jpeg REQUIRED)
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs



-- 
- Campbell