Blender Git Loki

Git Commits -> Revision 35ac032

Revision 35ac032 by Campbell Barton (master)
June 27, 2009, 22:48 (GMT)
CMake patch from Alexander Neundorf

-under UNIX, it uses FIND_PACKAGE() to find the jpg, png and zlib libraries

-it removes the explictely listed search paths, which are already searched by
default, so it is not necessary to list them again explicitely

-it removes the include directories /usr/include
and /usr/local/include. /usr/include is used by default, all other
directories should be searched via find_package/find_file and then added to
the include directories.

-replaces the include() commands for the FindXXX.cmake
modules with the appropriate find_package(Foo) calls.
This doesn't change the behaviour, but gives more features.
E.g. you could now say
find_package(JPEG REQUIRED)
and cmake will abort with an error if the package is not found.
Also it makes it clearer what is going on.

Additionally the patch removes the line
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
in the Windows if-branch.
Why was this there ? This file should be included anyway under Windows when
using the MS compiler.

Commit Details:

Full Hash: 35ac032b55ee0236b4093b932cfca4644b2a3cda
SVN Revision: 21202
Parent Commit: 67073db
Lines Changed: +20, -29

2 Modified Paths:

/CMake/macros.cmake (+1, -1) (Diff)
/CMakeLists.txt (+19, -28) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021