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

Merge pull request #11536 from FlameSoulis/patch-1

Browse source 
Fix DQT_CMAKE_PREFIX_PATH being overwritten
This commit is contained in:
Bradley Austin Davis 2017-10-08 10:22:30 -07:00 committed by GitHub
commit b960c81a85
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/macros/SetupQt.cmake
View file

@ -44,7 +44,11 @@ endfunction()
# Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables
# Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC # Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC
macro(setup_qt) macro(setup_qt)
set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}") # if QT_CMAKE_PREFIX_PATH was not specified before hand,
# try to use the environment variable
if (NOT QT_CMAKE_PREFIX_PATH)
set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}")
endif()
if (("QT_CMAKE_PREFIX_PATH" STREQUAL "") OR (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}")) if (("QT_CMAKE_PREFIX_PATH" STREQUAL "") OR (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}"))
calculate_default_qt_dir(QT_DIR) calculate_default_qt_dir(QT_DIR)
set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/lib/cmake") set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/lib/cmake")
@ -81,4 +85,4 @@ macro(setup_qt)
add_paths_to_fixup_libs("${QT_DIR}/bin") add_paths_to_fixup_libs("${QT_DIR}/bin")
endif () endif ()
endmacro() endmacro()