diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-08 04:32:53 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-09 00:35:14 +0200 |
| commit | 70d0d8890aff351f33c1b661c8afba50834eed41 (patch) | |
| tree | 799e563ad140ee2f13beba6506c7f0d8754be233 | |
| parent | CMake: Don't complain when Boost isn't found in the system. (diff) | |
| download | yuzu-70d0d8890aff351f33c1b661c8afba50834eed41.tar yuzu-70d0d8890aff351f33c1b661c8afba50834eed41.tar.gz yuzu-70d0d8890aff351f33c1b661c8afba50834eed41.tar.bz2 yuzu-70d0d8890aff351f33c1b661c8afba50834eed41.tar.lz yuzu-70d0d8890aff351f33c1b661c8afba50834eed41.tar.xz yuzu-70d0d8890aff351f33c1b661c8afba50834eed41.tar.zst yuzu-70d0d8890aff351f33c1b661c8afba50834eed41.zip | |
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | appveyor.yml | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b619e06fb..55880990c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,17 +190,11 @@ if (ENABLE_QT) if (DEFINED QT_VER) download_bundled_external("qt/" ${QT_VER} QT_PREFIX) endif() - elseif (DEFINED ENV{QTDIR}) - # Set CMAKE_PREFIX_PATH if QTDIR is defined in the environment This allows CMake to - # automatically find the Qt packages on Windows - set(QT_PREFIX "$ENV{QTDIR}") - endif() - # Passing an empty HINTS seems to cause default system paths to get ignored in CMake 2.8 so make - # sure to not pass anything if we don't have one - if (DEFINED QT_PREFIX) set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") else() + # Passing an empty HINTS seems to cause default system paths to get ignored in CMake 2.8 so + # make sure to not pass anything if we don't have one. set(QT_PREFIX_HINT) endif() diff --git a/appveyor.yml b/appveyor.yml index 4d6f53f96..6e073ece7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: before_build: - mkdir build - cd build - - cmake -G "Visual Studio 12 Win64" -DCITRA_USE_BUNDLED_GLFW=1 .. + - cmake -G "Visual Studio 12 Win64" -DCITRA_USE_BUNDLED_GLFW=1 -DQt5_DIR=%QTDIR%/lib/cmake/Qt5 .. - cd .. after_build: |