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 /intern | |
| 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 'intern')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/elbeem/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/smoke/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 5748b7b03d9..74f483eab05 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -231,7 +231,7 @@ if(WITH_FFTW3 AND FALSE) endif() if(WITH_PYTHON) - list(APPEND INC Python ${PYTHON_INC}) + list(APPEND INC Python ${PYTHON_INCLUDE_DIRS}) set(PYTHONSRC Python/AUD_PyAPI.cpp diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 44a4eb1f278..dd23e854a25 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -26,8 +26,8 @@ set(INC extern - ${PNG_INC} - ${ZLIB_INC} + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ) set(SRC diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index ec4f0d4ca6d..486ef92f638 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -28,8 +28,8 @@ set(INC intern ../memutil ../../extern/bullet2/src - ${PNG_INC} - ${ZLIB_INC} + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ) set(SRC |