merge branch 'android' of https://github.com/birarda/hifi into android

This commit is contained in:
Atlante45 2015-01-22 11:11:51 -08:00
commit 06895a2066

View file

@ -82,7 +82,8 @@ else ()
endif ()
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})
message(STATUS "QT_CMAKE_PREFIX_PATH is ${QT_CMAKE_PREFIX_PATH}")
set(QT_QMAKE_EXECUTABLE ${QT_CMAKE_PREFIX_PATH}/../../bin/qmake)
message(STATUS "QT_QMAKE_EXECUTABLE set to ${QT_QMAKE_EXECUTABLE}")
# set our OS X deployment target to
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)