From 078969bdd09204fa2ce7b36960b2134a53b9ce41 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 28 Aug 2015 16:57:08 -0300 Subject: CMake: Add option to download Qt and GLFW binaries over HTTP --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'appveyor.yml') diff --git a/appveyor.yml b/appveyor.yml index 5dc147639..4d6f53f96 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: before_build: - mkdir build - cd build - - cmake -G "Visual Studio 12 Win64" .. + - cmake -G "Visual Studio 12 Win64" -DCITRA_USE_BUNDLED_GLFW=1 .. - cd .. after_build: -- cgit v1.2.3 From 70d0d8890aff351f33c1b661c8afba50834eed41 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 7 Sep 2015 23:32:53 -0300 Subject: CMake: Remove support for QTDIR environment variable Using this variable is problematic is the user has several versions of Qt installed on their system. There is no way to know ahead of time if the Qt version pointed to by QTDIR matches the toolchain that is being targeted. The Qt installation path can still be easily specified if it's not found by CMake by setting the Qt5_DIR cache variable after the initial configuration run, so this shouldn't present an usability issue. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'appveyor.yml') 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: -- cgit v1.2.3