Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 10:51:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ZLIB dll find, bullet check

Browse source
This commit is contained in:
Stephen Birarda 2015-02-19 15:22:37 -08:00
parent c3b9198ec3
commit 63d4538b76
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/externals/bullet/CMakeLists.txt vendored
View file

@ -48,7 +48,7 @@ elseif (WIN32)
set(BULLET_LIB_EXT "lib") set(BULLET_LIB_EXT "lib")
endif () endif ()
if (DEFINED SHARED_LIB_EXT) if (DEFINED BULLET_LIB_EXT)
set(${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_RELEASE ${BULLET_LIB_DIR}/${LIB_PREFIX}BulletDynamics.${BULLET_LIB_EXT} CACHE TYPE "Bullet dynamics release library location") set(${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_RELEASE ${BULLET_LIB_DIR}/${LIB_PREFIX}BulletDynamics.${BULLET_LIB_EXT} CACHE TYPE "Bullet dynamics release library location")
set(${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_DEBUG NOTFOUND CACHE TYPE "Bullet dynamics debug library location") set(${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_DEBUG NOTFOUND CACHE TYPE "Bullet dynamics debug library location")

3
cmake/modules/FindZLIB.cmake
View file

@ -135,10 +135,11 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}") set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
endif() endif()
set(ZLIB_REQUIREMENTS ZLIB_LIBRARY ZLIB_INCLUDE_DIR VERSION_VAR ZLIB_VERSION_STRING) set(ZLIB_REQUIREMENTS ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
if (WIN32) if (WIN32)
list(APPEND ZLIB_REQUIREMENTS ZLIB_DLL_PATH) list(APPEND ZLIB_REQUIREMENTS ZLIB_DLL_PATH)
endif () endif ()
list(APPEND ZLIB_REQUIREMENTS VERSION_VAR ZLIB_VERSION_STRING)
# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE