diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-01 03:36:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-01 03:36:28 +0400 |
| commit | 2e840e56cfce44c93576085170d46373934cbebd (patch) | |
| tree | 85a12d78696045a5f155923531211b9c9a8f2f45 | |
| parent | 17f6d8337d4f1afe94153e37433a5f4931eb2f4a (diff) | |
CMake: correct include dirs
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extern/xdnd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/elbeem/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/smoke/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/datatoc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/CMakeLists.txt | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a72d965dd3b..f404d4c79f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1089,7 +1089,7 @@ elseif(WIN32) message(WARNING "Using HARDCODED libpng locations") set(PNG_LIBRARIES libpng) set(PNG "${LIBDIR}/png") - set(PNG_INCLUDE_DIR "${PNG}/include") + set(PNG_INCLUDE_DIRS "${PNG}/include") set(PNG_LIBPATH ${PNG}/lib) # not cmake defined endif() @@ -1360,7 +1360,7 @@ elseif(WIN32) add_definitions(-DFREE_WINDOWS) set(PNG "${LIBDIR}/png") - set(PNG_INCLUDE_DIR "${PNG}/include") + set(PNG_INCLUDE_DIRS "${PNG}/include") set(PNG_LIBPATH ${PNG}/lib) # not cmake defined if(WITH_MINGW64) @@ -1780,7 +1780,7 @@ elseif(APPLE) endif() set(PNG "${LIBDIR}/png") - set(PNG_INCLUDE_DIR "${PNG}/include") + set(PNG_INCLUDE_DIRS "${PNG}/include") set(PNG_LIBPATH ${PNG}/lib) set(JPEG "${LIBDIR}/jpeg") diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 5388570abec..9030ae9c1ed 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -68,7 +68,7 @@ if(WITH_LIBMV) set(INC_SYS ../Eigen3 - ${PNG_INCLUDE_DIR} + ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) diff --git a/extern/xdnd/CMakeLists.txt b/extern/xdnd/CMakeLists.txt index f7eded73d42..832ddfde396 100644 --- a/extern/xdnd/CMakeLists.txt +++ b/extern/xdnd/CMakeLists.txt @@ -28,7 +28,7 @@ set(INC ) set(INC_SYS - + ${X11_X11_INCLUDE_PATH} ) set(SRC diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 887abea3604..30c5615f1d2 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -29,7 +29,7 @@ set(INC ) set(INC_SYS - ${PNG_INCLUDE_DIR} + ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 2ca423dc73e..8cda0fd140f 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -30,7 +30,7 @@ set(INC set(INC_SYS ${BULLET_INCLUDE_DIRS} - ${PNG_INCLUDE_DIR} + ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt index 53fe8c32e9c..4c35a941757 100644 --- a/source/blender/datatoc/CMakeLists.txt +++ b/source/blender/datatoc/CMakeLists.txt @@ -53,7 +53,7 @@ if(NOT WITH_HEADLESS) ) endif() - include_directories(${PNG_INCLUDE_DIR}) + include_directories(${PNG_INCLUDE_DIRS}) link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH}) add_executable(datatoc_icon ${SRC}) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 4025a41b6a7..e8977913948 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -36,7 +36,7 @@ set(INC set(INC_SYS ${JPEG_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} + ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 2fc4df86332..fd73b4efb53 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -55,7 +55,7 @@ set(INC_SYS ../../../../intern/moto/include ${GLEW_INCLUDE_PATH} ${PYTHON_INCLUDE_DIRS} - ${PNG_INCLUDE_DIR} + ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) |