From 44f8e599e2f02c1f8076a95b490808c6170a4d15 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 19 Feb 2015 15:29:28 -0800
Subject: [PATCH] test the possibility that zlib is no longer required
---
interface/CMakeLists.txt | 7 ++-----
libraries/environment/CMakeLists.txt | 9 +--------
libraries/fbx/CMakeLists.txt | 6 +-----
libraries/octree/CMakeLists.txt | 8 --------
4 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index c54199dfe8..fb29667e09 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -106,7 +106,7 @@ endif()
add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
# set up the external glm library
-add_dependency_external_projects(glm bullet zlib)
+add_dependency_external_projects(glm bullet)
find_package(GLM REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
@@ -119,9 +119,6 @@ link_hifi_libraries(shared octree environment gpu model fbx metavoxels networkin
audio audio-client animation script-engine physics
render-utils entities-renderer)
-# find any optional and required libraries
-find_package(ZLIB REQUIRED)
-
# perform standard include and linking for found externals
foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
@@ -185,7 +182,7 @@ endif ()
include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")
target_link_libraries(
- ${TARGET_NAME} ${ZLIB_LIBRARIES}
+ ${TARGET_NAME}
Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::OpenGL Qt5::Script Qt5::Svg Qt5::WebKitWidgets
)
diff --git a/libraries/environment/CMakeLists.txt b/libraries/environment/CMakeLists.txt
index 61a8c6b8df..a2ee9e3f55 100644
--- a/libraries/environment/CMakeLists.txt
+++ b/libraries/environment/CMakeLists.txt
@@ -7,11 +7,4 @@ add_dependency_external_projects(glm)
find_package(GLM REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
-link_hifi_libraries(shared networking)
-
-# find ZLIB
-find_package(ZLIB REQUIRED)
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-
-# add it to our list of libraries to link
-target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})
\ No newline at end of file
+link_hifi_libraries(shared networking)
\ No newline at end of file
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index c1ba5a1c2a..1ce1c74922 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -7,8 +7,4 @@ add_dependency_external_projects(glm)
find_package(GLM REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
-link_hifi_libraries(shared gpu model networking octree)
-
-find_package(ZLIB REQUIRED)
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})
\ No newline at end of file
+link_hifi_libraries(shared gpu model networking octree)
\ No newline at end of file
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 1f44795148..cc36aead15 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -8,11 +8,3 @@ find_package(GLM REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
link_hifi_libraries(shared networking)
-
-# find ZLIB
-find_package(ZLIB REQUIRED)
-
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-
-# append ZLIB and OpenSSL to our list of libraries to link
-target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})