kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: correct include dirs

Browse Source
This commit is contained in:
Campbell Barton 2014-07-01 09:36:11 +10:00
parent 17f6d8337d
commit 2e840e56cf
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1089,7 +1089,7 @@ elseif(WIN32)
message(WARNING "Using HARDCODED libpng locations") message(WARNING "Using HARDCODED libpng locations")
set(PNG_LIBRARIES libpng) set(PNG_LIBRARIES libpng)
set(PNG "${LIBDIR}/png") set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIR "${PNG}/include") set(PNG_INCLUDE_DIRS "${PNG}/include")
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
endif() endif()
@ -1360,7 +1360,7 @@ elseif(WIN32)
add_definitions(-DFREE_WINDOWS) add_definitions(-DFREE_WINDOWS)
set(PNG "${LIBDIR}/png") set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIR "${PNG}/include") set(PNG_INCLUDE_DIRS "${PNG}/include")
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
if(WITH_MINGW64) if(WITH_MINGW64)
@ -1780,7 +1780,7 @@ elseif(APPLE)
endif() endif()
set(PNG "${LIBDIR}/png") set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIR "${PNG}/include") set(PNG_INCLUDE_DIRS "${PNG}/include")
set(PNG_LIBPATH ${PNG}/lib) set(PNG_LIBPATH ${PNG}/lib)
set(JPEG "${LIBDIR}/jpeg") set(JPEG "${LIBDIR}/jpeg")

2
extern/libmv/CMakeLists.txt vendored
View File

@ -68,7 +68,7 @@ if(WITH_LIBMV)
set(INC_SYS set(INC_SYS
../Eigen3 ../Eigen3
${PNG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )

2
extern/xdnd/CMakeLists.txt vendored
View File

@ -28,7 +28,7 @@ set(INC
) )
set(INC_SYS set(INC_SYS
${X11_X11_INCLUDE_PATH}
) )
set(SRC set(SRC

2
intern/elbeem/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set(INC
) )
set(INC_SYS set(INC_SYS
${PNG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )

2
intern/smoke/CMakeLists.txt
View File

@ -30,7 +30,7 @@ set(INC
set(INC_SYS set(INC_SYS
${BULLET_INCLUDE_DIRS} ${BULLET_INCLUDE_DIRS}
${PNG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )

2
source/blender/datatoc/CMakeLists.txt
View File

@ -53,7 +53,7 @@ if(NOT WITH_HEADLESS)
) )
endif() endif()
include_directories(${PNG_INCLUDE_DIR}) include_directories(${PNG_INCLUDE_DIRS})
link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH}) link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
add_executable(datatoc_icon ${SRC}) add_executable(datatoc_icon ${SRC})

2
source/blender/imbuf/CMakeLists.txt
View File

@ -36,7 +36,7 @@ set(INC
set(INC_SYS set(INC_SYS
${JPEG_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}
${PNG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )

2
source/gameengine/GamePlayer/common/CMakeLists.txt
View File

@ -55,7 +55,7 @@ set(INC_SYS
../../../../intern/moto/include ../../../../intern/moto/include
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${PNG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )