mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 04:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update default Qt version to 5.6

Browse Source 
Fixed compilation issue on Mac
This commit is contained in:
Alexander Bock
2016-04-30 10:24:49 +02:00
parent 25702a787f
commit bfbf823959
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/time.cpp
View File

@@ -24,13 +24,14 @@
#include <openspace/util/time.h>
#include "time_lua.inl"
#include <openspace/util/spicemanager.h>
#include <openspace/util/syncbuffer.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/misc/assert.h>
#include "time_lua.inl"
namespace openspace {

3
src/util/time_lua.inl
View File

@@ -23,8 +23,9 @@
****************************************************************************************/
#include <ghoul/misc/assert.h>
#include <ctime>
#include <cppformat/format.h>
#include <ctime>
namespace openspace {

2
support/cmake/support_macros.cmake
View File

@@ -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 ()