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

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-09-11 11:52:31 +02:00
parent ab22c18714 7aceb54bec
commit 4cdae984e9
60 changed files with 1115 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
support/cmake/openspace_header.template
View File

@@ -37,6 +37,12 @@ constexpr int OPENSPACE_VERSION_PATCH = @OPENSPACE_VERSION_PATCH@;
constexpr const char* OPENSPACE_VERSION_STRING = "@OPENSPACE_VERSION_STRING@";
constexpr const char* OPENSPACE_VERSION_STRING_FULL = "@OPENSPACE_VERSION_MAJOR@.@OPENSPACE_VERSION_MINOR@.@OPENSPACE_VERSION_PATCH@ (@OPENSPACE_VERSION_STRING@)";
constexpr const char* OPENSPACE_GIT_BRANCH = "@OPENSPACE_GIT_BRANCH@";
constexpr const char* OPENSPACE_GIT_COMMIT = "@OPENSPACE_GIT_COMMIT@";
constexpr const char* OPENSPACE_GIT_FULL = "@OPENSPACE_GIT_BRANCH@@@OPENSPACE_GIT_COMMIT@";
} // namespace openspace
#endif // __OPENSPACE_CORE___OPENSPACE___H__

3
support/cmake/set_openspace_compile_settings.cmake
View File

@@ -68,6 +68,9 @@ function (set_openspace_compile_settings project)
"/w44988" # 'symbol': variable declared outside class/function scope
"/std:c++latest"
"/permissive-"
"/Zc:twoPhase-" # Used to prevent C:\Program Files (x86)\Windows Kits\8.1\Include\um\combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here
# This is a bug in Visual Studio 15.3 and can be removed with the next version:
# https://developercommunity.visualstudio.com/content/problem/94419/vs-2017-153-with-permissive-shows-error-c2187-in-c.html
"/Zc:strictStrings-" # Windows header don't adhere to this
)
if (OPENSPACE_WARNINGS_AS_ERRORS)