CMake: correct include dirs
authorCampbell Barton <ideasman42@gmail.com>
Mon, 30 Jun 2014 23:36:11 +0000 (09:36 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 30 Jun 2014 23:36:28 +0000 (09:36 +1000)
CMakeLists.txt
extern/libmv/CMakeLists.txt
extern/xdnd/CMakeLists.txt
intern/elbeem/CMakeLists.txt
intern/smoke/CMakeLists.txt
source/blender/datatoc/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt

index a72d965..f404d4c 100644 (file)
@@ -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")
index 5388570..9030ae9 100644 (file)
@@ -68,7 +68,7 @@ if(WITH_LIBMV)
 
        set(INC_SYS
                ../Eigen3
-               ${PNG_INCLUDE_DIR}
+               ${PNG_INCLUDE_DIRS}
                ${ZLIB_INCLUDE_DIRS}
        )
 
index f7eded7..832ddfd 100644 (file)
@@ -28,7 +28,7 @@ set(INC
 )
 
 set(INC_SYS
-
+       ${X11_X11_INCLUDE_PATH}
 )
 
 set(SRC
index 887abea..30c5615 100644 (file)
@@ -29,7 +29,7 @@ set(INC
 )
 
 set(INC_SYS
-       ${PNG_INCLUDE_DIR}
+       ${PNG_INCLUDE_DIRS}
        ${ZLIB_INCLUDE_DIRS}
 )
 
index 2ca423d..8cda0fd 100644 (file)
@@ -30,7 +30,7 @@ set(INC
 
 set(INC_SYS
        ${BULLET_INCLUDE_DIRS}
-       ${PNG_INCLUDE_DIR}
+       ${PNG_INCLUDE_DIRS}
        ${ZLIB_INCLUDE_DIRS}
 )
 
index 53fe8c3..4c35a94 100644 (file)
@@ -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})
index 4025a41..e897791 100644 (file)
@@ -36,7 +36,7 @@ set(INC
 
 set(INC_SYS
        ${JPEG_INCLUDE_DIR}
-       ${PNG_INCLUDE_DIR}
+       ${PNG_INCLUDE_DIRS}
        ${ZLIB_INCLUDE_DIRS}
 )
 
index 2fc4df8..fd73b4e 100644 (file)
@@ -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}
 )