Fix #3347
This commit is contained in:
parent
1a9f0163e0
commit
973b29980d
@ -8,9 +8,12 @@ if(NOT SERVER_ONLY)
|
|||||||
"${PNG_INCLUDE_DIRS}"
|
"${PNG_INCLUDE_DIRS}"
|
||||||
"${ZLIB_INCLUDE_DIR}")
|
"${ZLIB_INCLUDE_DIR}")
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/") # For zconf.h on WIN32
|
||||||
|
endif()
|
||||||
|
|
||||||
if(MSVC OR APPLE)
|
if(MSVC OR APPLE)
|
||||||
include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/" # For zconf.h on WIN32
|
include_directories("${CMAKE_CURRENT_BINARY_DIR}/../libpng/")
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/../libpng/")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT USE_GLES2)
|
if(NOT USE_GLES2)
|
||||||
@ -59,7 +62,7 @@ if(NOT SERVER_ONLY)
|
|||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/")
|
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/")
|
||||||
if(MSVC OR APPLE)
|
if(MSVC)
|
||||||
include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/")
|
include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/")
|
||||||
else()
|
else()
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user