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 | |
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')
-rw-r--r-- | source/blender/avi/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenloader/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/space_script/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/space_text/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt index 5153cc5b68d..77a43e5560e 100644 --- a/source/blender/avi/CMakeLists.txt +++ b/source/blender/avi/CMakeLists.txt @@ -27,7 +27,7 @@ set(INC . ../../../intern/guardedalloc - ${JPEG_INC} + ${JPEG_INCLUDE_DIR} ) set(SRC 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() diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 35acbe5e831..dc043c3a21e 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -31,7 +31,7 @@ set(INC ../gpu ../../../intern/ghost ../../../intern/guardedalloc - ${ZLIB_INC} + ${ZLIB_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ) diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index e51fb35a4ac..4d8ac9bc4b6 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -33,7 +33,7 @@ set(INC ../makesrna ../render/extern/include ../../../intern/guardedalloc - ${ZLIB_INC} + ${ZLIB_INCLUDE_DIRS} ) set(SRC diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index ddfd3a69d9e..1427e814b41 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -39,7 +39,7 @@ set(SRC ) if(WITH_PYTHON) - list(APPEND INC ${PYTHON_INC} ../../python) + list(APPEND INC ${PYTHON_INCLUDE_DIRS} ../../python) add_definitions(-DWITH_PYTHON) endif() diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 800a18b95e1..8c18630ab7d 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -41,7 +41,7 @@ set(SRC ) if(WITH_PYTHON) - list(APPEND INC ${PYTHON_INC} ../../python) + list(APPEND INC ${PYTHON_INCLUDE_DIRS} ../../python) add_definitions(-DWITH_PYTHON) endif() diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index c86e786ba1e..f007305e148 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -32,9 +32,9 @@ set(INC ../makesdna ../../../intern/memutil ../../../intern/guardedalloc - ${JPEG_INC} - ${PNG_INC} - ${ZLIB_INC} + ${JPEG_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ) set(SRC diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 727d2289354..787c93f5b8a 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -33,7 +33,7 @@ set(INC ../render/extern/include ../../../intern/guardedalloc ../../../intern/elbeem/extern - ${ZLIB_INC} + ${ZLIB_INCLUDE_DIRS} ) set(SRC diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index ad9f9ed426c..09a627b51d4 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -149,7 +149,7 @@ set(SRC ) if(WITH_PYTHON) - set(INC ${INC} ../python ${PYTHON_INC}) + set(INC ${INC} ../python ${PYTHON_INCLUDE_DIRS}) add_definitions(-DWITH_PYTHON) endif() diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index aef2438c961..58d69db4a0e 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -25,7 +25,7 @@ set(INC ../../blenkernel ../../../../intern/guardedalloc ../../../../extern/glew/include - ${PYTHON_INC} + ${PYTHON_INCLUDE_DIRS} ) set(SRC diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index dc5559a5b38..3c7804ab7e3 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -33,7 +33,7 @@ set(INC ../../editors/include ../../../../intern/guardedalloc ../../../../intern/audaspace/intern - ${PYTHON_INC} + ${PYTHON_INCLUDE_DIRS} ) set(SRC diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index ecd7f3be12c..2be62d5a8b2 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -96,7 +96,7 @@ if(WITH_CODEC_FFMPEG) endif() if(WITH_PYTHON) - list(APPEND INC ../python ${PYTHON_INC}) + list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS}) add_definitions(-DWITH_PYTHON) endif() |