Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:49:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix polyvox double name change command

Browse source
This commit is contained in:
Stephen Birarda 2015-09-28 14:26:53 -04:00
parent 2d477ad3b9
commit 06ca4dfbde
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@ if (WIN32)
endif() endif()
elseif(APPLE) elseif(APPLE)
ExternalProject_Add( ExternalProject_Add(
${EXTERNAL_NAME} ${EXTERNAL_NAME}
URL http://static.oculus.com/sdk-downloads/ovr_sdk_macos_0.5.0.1.tar.gz URL http://static.oculus.com/sdk-downloads/ovr_sdk_macos_0.5.0.1.tar.gz

7
cmake/externals/polyvox/CMakeLists.txt vendored
View file

@ -19,19 +19,20 @@ ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
if (APPLE) if (APPLE)
set(INSTALL_NAME_LIBRARY_DIR ${INSTALL_DIR}/lib) set(INSTALL_NAME_LIBRARY_DIR ${INSTALL_DIR}/lib)
message(STATUS "in polyvox INSTALL_NAME_LIBRARY_DIR ${INSTALL_NAME_LIBRARY_DIR}")
ExternalProject_Add_Step( ExternalProject_Add_Step(
${EXTERNAL_NAME} ${EXTERNAL_NAME}
change-install-name change-install-name-debug
COMMENT "Calling install_name_tool on libraries to fix install name for dylib linking" COMMENT "Calling install_name_tool on libraries to fix install name for dylib linking"
COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${INSTALL_NAME_LIBRARY_DIR}/Debug -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${INSTALL_NAME_LIBRARY_DIR}/Debug -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
DEPENDEES install DEPENDEES install
WORKING_DIRECTORY <SOURCE_DIR> WORKING_DIRECTORY <SOURCE_DIR>
LOG 1 LOG 1
) )
ExternalProject_Add_Step( ExternalProject_Add_Step(
${EXTERNAL_NAME} ${EXTERNAL_NAME}
change-install-name change-install-name-release
COMMENT "Calling install_name_tool on libraries to fix install name for dylib linking" COMMENT "Calling install_name_tool on libraries to fix install name for dylib linking"
COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${INSTALL_NAME_LIBRARY_DIR}/Release -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${INSTALL_NAME_LIBRARY_DIR}/Release -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
DEPENDEES install DEPENDEES install