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/gameengine/GamePlayer | |
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/gameengine/GamePlayer')
-rw-r--r-- | source/gameengine/GamePlayer/common/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 9bab870ccd5..0bd8a0dd9a3 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -52,9 +52,9 @@ set(INC ../../../../source/blender/blenloader ../../../../source/blender/gpu ../../../../extern/glew/include - ${PYTHON_INC} - ${PNG_INC} - ${ZLIB_INC} + ${PYTHON_INCLUDE_DIRS} + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ) set(SRC diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index e72f2d53f77..dc137861745 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -54,7 +54,7 @@ set(INC ../../../../source/blender/blenloader ../../../../source/blender/gpu ../../../../extern/glew/include - ${PYTHON_INC} + ${PYTHON_INCLUDE_DIRS} ) set(SRC |