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

find QT_DIR in root CMakeLists

Browse source
This commit is contained in:
Stephen Birarda 2015-02-18 11:38:08 -08:00
parent b2ecf99008
commit 84e82f045d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -86,6 +86,9 @@ else ()
endif ()
endif ()
# figure out where the qt dir is
get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})
# set our OS X deployment target to
@ -127,7 +130,7 @@ if (ANDROID)
endif ()
if (WIN32)
add_paths_to_lib_paths("${QT_CMAKE_PREFIX_PATH}\\..\\..\\bin")
add_paths_to_lib_paths("${QT_DIR}/bin")
endif ()
# add subdirectories for all targets

3
cmake/android/QtCreateAPK.cmake
View file

@ -39,9 +39,6 @@ macro(qt_create_apk)
# create "strings.xml"
configure_file("${ANDROID_THIS_DIRECTORY}/strings.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/strings.xml")
# figure out where the qt dir is
get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)
# find androiddeployqt
find_program(ANDROID_DEPLOY_QT androiddeployqt HINTS "${QT_DIR}/bin")