From bfbf8239595a341b284864ff8f06027502424dd2 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 30 Apr 2016 10:24:49 +0200 Subject: [PATCH] Update default Qt version to 5.6 Fixed compilation issue on Mac --- src/util/time.cpp | 3 ++- src/util/time_lua.inl | 3 ++- support/cmake/support_macros.cmake | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/time.cpp b/src/util/time.cpp index dd70f3c398..a4aa96925f 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -24,13 +24,14 @@ #include +#include "time_lua.inl" + #include #include #include #include -#include "time_lua.inl" namespace openspace { diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl index 56a1606700..687780c459 100644 --- a/src/util/time_lua.inl +++ b/src/util/time_lua.inl @@ -23,8 +23,9 @@ ****************************************************************************************/ #include -#include + #include +#include namespace openspace { diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake index 8e3bb7e588..44bbbc0df7 100644 --- a/support/cmake/support_macros.cmake +++ b/support/cmake/support_macros.cmake @@ -149,7 +149,7 @@ function (add_external_dependencies) # Unfortunately, we have to set this value manually; sigh # In the future, if the Qt version is updated, just add to this variable ---abock if (APPLE) - set(CMAKE_PREFIX_PATH "~/Qt/5.5/clang_64/lib/cmake" PARENT_SCOPE) + set(CMAKE_PREFIX_PATH "~/Qt/5.6/clang_64/lib/cmake" PARENT_SCOPE) endif () endfunction ()