pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-07 03:02:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #544 from stheno/web_interface

Browse Source 
zlib warning fixes in cmake
This commit is contained in:
Akkadius 2016-08-26 14:27:33 -05:00 committed by GitHub
commit 8e4bb3b0fe
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dependencies/libwebsockets/CMakeLists.txt vendored
View File

@ -1,5 +1,12 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
if(POLICY CMP0046)
cmake_policy(VERSION 2.8)
# The new policy for add_dependencies is to now error if a dependency target
# is not found. The old policy didn't care and continued through configuration
cmake_policy(SET CMP0046 OLD)
endif()
project(libwebsockets) project(libwebsockets)
set(PACKAGE "libwebsockets") set(PACKAGE "libwebsockets")
@ -453,6 +460,12 @@ if (NOT LWS_WITHOUT_EXTENSIONS)
# Set the same variables as find_package would. # Set the same variables as find_package would.
set(ZLIB_INCLUDE_DIRS ${WIN32_ZLIB_PATH}) set(ZLIB_INCLUDE_DIRS ${WIN32_ZLIB_PATH})
if(POLICY CMP0026)
cmake_policy(VERSION 2.8)
# The new policy for add_dependencies is to now error if a dependency target
# is not found. The old policy didn't care and continued through configuration
cmake_policy(SET CMP0026 OLD)
endif()
get_property(ZLIB_LIBRARIES TARGET ZLIB PROPERTY LOCATION) get_property(ZLIB_LIBRARIES TARGET ZLIB PROPERTY LOCATION)
set(ZLIB_FOUND 1) set(ZLIB_FOUND 1)
else() else()
@ -464,8 +477,8 @@ if (NOT LWS_WITHOUT_EXTENSIONS)
add_dependencies(${lib} ZLIB) add_dependencies(${lib} ZLIB)
endforeach() endforeach()
message("ZLib include dirs: ${ZLIB_INCLUDE_DIRS}") message(STATUS "ZLib include dirs: ${ZLIB_INCLUDE_DIRS}")
message("ZLib libraries: ${ZLIB_LIBRARIES}") message(STATUS "ZLib libraries: ${ZLIB_LIBRARIES}")
include_directories(${ZLIB_INCLUDE_DIRS}) include_directories(${ZLIB_INCLUDE_DIRS})
list(APPEND LIB_LIST ${ZLIB_LIBRARIES}) list(APPEND LIB_LIST ${ZLIB_LIBRARIES})
endif(NOT LWS_WITHOUT_EXTENSIONS) endif(NOT LWS_WITHOUT_EXTENSIONS)