Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Find Zlib the right way.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-06-17 13:57:01 -07:00
parent 2c0bea3f33
commit 6b065ab856
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/CMakeLists.txt
View file

@ -86,6 +86,7 @@ link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
find_package(LibOVR) find_package(LibOVR)
find_package(OpenCV) find_package(OpenCV)
find_package(ZLIB)
# include headers for interface and InterfaceConfig. # include headers for interface and InterfaceConfig.
include_directories( include_directories(
@ -102,7 +103,7 @@ include_directories(
${OPENCV_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS}
) )
target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES} ${OPENCV_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES} ${OPENCV_LIBRARIES} ${ZLIB_LIBRARIES})
if (APPLE) if (APPLE)
# link in required OS X frameworks and include the right GL headers # link in required OS X frameworks and include the right GL headers
@ -117,7 +118,6 @@ if (APPLE)
find_library(OpenGL OpenGL) find_library(OpenGL OpenGL)
find_library(IOKit IOKit) find_library(IOKit IOKit)
find_library(QTKit QTKit) find_library(QTKit QTKit)
find_library(ZLIB_LIBRARY zlib)
target_link_libraries( target_link_libraries(
${TARGET_NAME} ${TARGET_NAME}
@ -132,7 +132,6 @@ if (APPLE)
${OpenGL} ${OpenGL}
${IOKit} ${IOKit}
${QTKit} ${QTKit}
${ZLIB_LIBRARY}
${LIBOVR_LIBRARIES} ${LIBOVR_LIBRARIES}
) )
else (APPLE) else (APPLE)