Commit: 2e840e56cfce44c93576085170d46373934cbebd
Author: Campbell Barton
Date: Tue Jul 1 09:36:11 2014 +1000
https://developer.blender.org/rB2e840e56cfce44c93576085170d46373934cbebd
CMake: correct include dirs
===================================================================
M CMakeLists.txt
M extern/libmv/CMakeLists.txt
M extern/xdnd/CMakeLists.txt
M intern/elbeem/CMakeLists.txt
M intern/smoke/CMakeLists.txt
M source/blender/datatoc/CMakeLists.txt
M source/blender/imbuf/CMakeLists.txt
M source/gameengine/GamePlayer/common/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a72d965..f404d4c 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 5388570..9030ae9 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 f7eded7..832ddfd 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 887abea..30c5615 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 2ca423d..8cda0fd 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 53fe8c3..4c35a94 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 4025a41..e897791 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 2fc4df8..fd73b4e 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}
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
