forked from bartvdbraak/blender
CMake: correct include dirs
This commit is contained in:
parent
17f6d8337d
commit
2e840e56cf
@ -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")
|
||||
|
2
extern/libmv/CMakeLists.txt
vendored
2
extern/libmv/CMakeLists.txt
vendored
@ -68,7 +68,7 @@ if(WITH_LIBMV)
|
||||
|
||||
set(INC_SYS
|
||||
../Eigen3
|
||||
${PNG_INCLUDE_DIR}
|
||||
${PNG_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
2
extern/xdnd/CMakeLists.txt
vendored
2
extern/xdnd/CMakeLists.txt
vendored
@ -28,7 +28,7 @@ set(INC
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
|
||||
${X11_X11_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@ -29,7 +29,7 @@ set(INC
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
${PNG_INCLUDE_DIR}
|
||||
${PNG_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -30,7 +30,7 @@ set(INC
|
||||
|
||||
set(INC_SYS
|
||||
${BULLET_INCLUDE_DIRS}
|
||||
${PNG_INCLUDE_DIR}
|
||||
${PNG_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -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})
|
||||
|
@ -36,7 +36,7 @@ set(INC
|
||||
|
||||
set(INC_SYS
|
||||
${JPEG_INCLUDE_DIR}
|
||||
${PNG_INCLUDE_DIR}
|
||||
${PNG_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user