osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Cleanup CMake VS solution 

Move the zlib artefacts into Libs\zlib "folder"

Change-Id: Iddf0121fad3885553d908a51e9e07a7f676403fe
Reviewed-on: https://code.wireshark.org/review/7993
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
This commit is contained in:
Graham Bloice 2015-04-08 23:19:31 +01:00
parent 054a1aab50
commit 08c223a53a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -634,6 +634,11 @@ if(ENABLE_ZLIB)
add_subdirectory("${ZLIB_SRC_DIR}" "${CMAKE_BINARY_DIR}/zlib")
set(ZLIB_INCLUDE_DIR "${ZLIB_SRC_DIR}" "${CMAKE_BINARY_DIR}/zlib")
set(ZLIB_LIBRARY zlib)
# Annoyingly zlib also builds some other stuff we aren't interested in
set_target_properties(zlib PROPERTIES FOLDER "Libs/zlib")
set_target_properties(zlibstatic PROPERTIES FOLDER "Libs/zlib")
set_target_properties(example PROPERTIES FOLDER "Libs/zlib")
set_target_properties(minigzip PROPERTIES FOLDER "Libs/zlib")
endif()
set(PACKAGELIST ${PACKAGELIST} ZLIB)
endif()