From 06ca4dfbde8e601fc934d2e6c858108228d65478 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 28 Sep 2015 14:26:53 -0400 Subject: [PATCH 1/4] fix polyvox double name change command --- cmake/externals/LibOVR/CMakeLists.txt | 2 +- cmake/externals/polyvox/CMakeLists.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/externals/LibOVR/CMakeLists.txt b/cmake/externals/LibOVR/CMakeLists.txt index e03a3af484..8d13882d48 100644 --- a/cmake/externals/LibOVR/CMakeLists.txt +++ b/cmake/externals/LibOVR/CMakeLists.txt @@ -43,7 +43,7 @@ if (WIN32) endif() elseif(APPLE) - + ExternalProject_Add( ${EXTERNAL_NAME} URL http://static.oculus.com/sdk-downloads/ovr_sdk_macos_0.5.0.1.tar.gz diff --git a/cmake/externals/polyvox/CMakeLists.txt b/cmake/externals/polyvox/CMakeLists.txt index 14712e5537..3740e26762 100644 --- a/cmake/externals/polyvox/CMakeLists.txt +++ b/cmake/externals/polyvox/CMakeLists.txt @@ -19,19 +19,20 @@ ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR) if (APPLE) set(INSTALL_NAME_LIBRARY_DIR ${INSTALL_DIR}/lib) - message(STATUS "in polyvox INSTALL_NAME_LIBRARY_DIR ${INSTALL_NAME_LIBRARY_DIR}") + ExternalProject_Add_Step( ${EXTERNAL_NAME} - change-install-name + change-install-name-debug 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 DEPENDEES install WORKING_DIRECTORY LOG 1 ) + ExternalProject_Add_Step( ${EXTERNAL_NAME} - change-install-name + change-install-name-release 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 DEPENDEES install From 3744632122918f2bf7a7dcde49b192be9b39eae7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 28 Sep 2015 14:37:59 -0400 Subject: [PATCH 2/4] allow SDK fallback if 10.9 not present --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b91fac2538..87bf29e0e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,13 +127,14 @@ if (APPLE) ) if (NOT _OSX_DESIRED_SDK_PATH) - message(FATAL_ERROR "Could not find OS X ${OSX_SDK} SDK. Please pass OSX_SDK_PATH to CMake to point us to your SDKs directory.") + message(STATUS "Could not find OS X ${OSX_SDK} SDK. Will fall back to default. If you want a specific SDK, please pass OSX_SDK and optionall OSX_SDK_PATH to CMake.") else () message(STATUS "Found OS X ${OSX_SDK} SDK at ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk") + + # set that as the SDK to use + set(CMAKE_OSX_SYSROOT ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk) endif () - # set that as the SDK to use - set(CMAKE_OSX_SYSROOT ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk) endif () # Hide automoc folders (for IDEs) From 386df86fd16ba2179a30aad1358ef663dcc21375 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 28 Sep 2015 14:52:17 -0400 Subject: [PATCH 3/4] use the OS X version as the desired SDK --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87bf29e0e2..0e6114b67c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,12 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH}) if (APPLE) - SET(OSX_SDK "10.9" CACHE String "OS X SDK version to look for inside Xcode bundle or at OSX_SDK_PATH") + exec_program(sw_vers ARGS -productVersion OUTPUT_VARIABLE OSX_VERSION) + message(STATUS "${OSX_VERSION}") + string(REGEX MATCH "^[0-9]+\\.[0-9]+" OSX_VERSION ${OSX_VERSION}) + message(STATUS "Detected OS X version = ${OSX_VERSION}") + + set(OSX_SDK "${OSX_VERSION}" CACHE String "OS X SDK version to look for inside Xcode bundle or at OSX_SDK_PATH") # set our OS X deployment target set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8) @@ -127,7 +132,7 @@ if (APPLE) ) if (NOT _OSX_DESIRED_SDK_PATH) - message(STATUS "Could not find OS X ${OSX_SDK} SDK. Will fall back to default. If you want a specific SDK, please pass OSX_SDK and optionall OSX_SDK_PATH to CMake.") + message(STATUS "Could not find OS X ${OSX_SDK} SDK. Will fall back to default. If you want a specific SDK, please pass OSX_SDK and optionally OSX_SDK_PATH to CMake.") else () message(STATUS "Found OS X ${OSX_SDK} SDK at ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk") From 29765200614ad7e47fea8016ab77c388d3719fee Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 28 Sep 2015 14:53:51 -0400 Subject: [PATCH 4/4] remove an extra debug in root CMake --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e6114b67c..0e7df899ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,6 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH}) if (APPLE) exec_program(sw_vers ARGS -productVersion OUTPUT_VARIABLE OSX_VERSION) - message(STATUS "${OSX_VERSION}") string(REGEX MATCH "^[0-9]+\\.[0-9]+" OSX_VERSION ${OSX_VERSION}) message(STATUS "Detected OS X version = ${OSX_VERSION}")