CMake: correct include dirs

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a72d965dd3bf141f47861d9eeaf6437fec4ec34a..f404d4c79f718cb19adf6c7d70291dc61eebe985 100644 (file)
--- 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 5388570abecfd47ffb8082e14c8b780bdf12abda..9030ae9c1eda8f17e1676cac09c903a7c2b7ffcd 100644 (file)
--- 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 f7eded73d426f1cbdd94c696ee41285b7eb510d4..832ddfde396db9da0d7a46131ae0a57fc1bbba76 100644 (file)
--- 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 887abea360453f695af280982ec6663ad3d07052..30c5615f1d2c45ca725f960248b07ea19f1ea4c2 100644 (file)
--- 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 2ca423dc73efecf0570ab744998a4b0d7edc2d06..8cda0fd140f703f009272ee79bb8dce72405410c 100644 (file)
--- 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 53fe8c32e9c0d542d5cd6985529e04564bb9210b..4c35a9417573467baadc22a8994c86024324ff5f 100644 (file)
--- 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 4025a41b6a7788b2ebbc7b82bad755e137661ed3..e8977913948391488402858329dbb0cc4f1b9eca 100644 (file)
--- 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 2fc4df86332d39fe81c787a57d5bc5e20719d062..fd73b4efb53b864322d61e5f660b05891bccb3cc 100644 (file)
--- 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}
 )