diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-25 17:43:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-25 17:43:13 +0300 |
| commit | 1bd0db59f4750dd9603d82544f63d89f53288a93 (patch) | |
| tree | def1e4adfe1cf7aa3fba0e008ce58951cbe4f813 /source/blender/blenkernel/CMakeLists.txt | |
| parent | da2b4901981e4180f763f45bf8e3bd4262539ad2 (diff) | |
use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken.
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 672ef0b6494..63214f6ee11 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -49,7 +49,7 @@ set(INC ../../../intern/opennl/extern ../../../intern/smoke/extern ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h - ${ZLIB_INC} + ${ZLIB_INCLUDE_DIRS} ) set(SRC @@ -273,7 +273,7 @@ if(WITH_LCMS) endif() if(WITH_PYTHON) - list(APPEND INC ../python ${PYTHON_INC}) + list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS}) add_definitions(-DWITH_PYTHON) endif() |