diff --git a/CMakeLists.txt b/CMakeLists.txt index 68945f167a..a979b6c375 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,9 +27,9 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project(OpenSpace) set(OPENSPACE_VERSION_MAJOR 0) -set(OPENSPACE_VERSION_MINOR 17) -set(OPENSPACE_VERSION_PATCH 1) -set(OPENSPACE_VERSION_STRING "Beta-10") +set(OPENSPACE_VERSION_MINOR 18) +set(OPENSPACE_VERSION_PATCH -1) +set(OPENSPACE_VERSION_STRING "Beta-11") set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}") set(OPENSPACE_CMAKE_EXT_DIR "${OPENSPACE_BASE_DIR}/support/cmake") diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt index d91dd2a541..7b9a579a47 100644 --- a/apps/OpenSpace/CMakeLists.txt +++ b/apps/OpenSpace/CMakeLists.txt @@ -123,6 +123,7 @@ set_folder_location(quat "External") set_folder_location(tinyxml2static "External") set_folder_location(vrpn "External") set_folder_location(zlibstatic "External") +set_folder_location(SGCTTest "Unit Tests") if (UNIX AND (NOT APPLE)) target_link_libraries(OpenSpace PRIVATE Xcursor Xinerama X11) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 5336db13c7..3befe6c7a0 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 5336db13c7c70816ad93248a82ed2fd3a9433e9b +Subproject commit 3befe6c7a083bf11a71eab8e87101afce8049997