Commit 2a50f6ac authored by Robert Menzel's avatar Robert Menzel

reduced cmake dependencies, better error message in RiftController

parent 343315f4
......@@ -4,7 +4,26 @@
# e.g.: INCLUDE(${CMAKE_SOURCE_DIR}/extern/acgl/CMakeListsStaticInclude.txt)
#
include(${CMAKE_CURRENT_LIST_DIR}/cmake/CMakeMacros.txt)
################################################################################
# Macro to sort acgl into directories
################################################################################
MACRO (RECURSE_GROUPS dirname)
FILE(GLOB_RECURSE allfiles "${dirname}/*.*")
SET(ALL_FILES ${ALL_FILES} ${allfiles})
STRING(REGEX REPLACE ".*/([^/]*)" "\\1" maindir "${dirname}")
FOREACH(file ${allfiles})
STRING(REGEX REPLACE "${dirname}/(.*)/[^/]*" "\\1" loopdirname "${file}")
STRING(REGEX REPLACE "/" "\\\\" loopdirname "${loopdirname}")
IF(NOT "${file}" MATCHES "${dirname}/(.*)/[^/]*")
source_group("${maindir}" FILES ${file})
ELSE()
source_group("${maindir}\\${loopdirname}" FILES ${file})
ENDIF()
ENDFOREACH()
ENDMACRO (RECURSE_GROUPS)
SET(ACGL_BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
# Find all used files of certain file-types
......
......@@ -131,7 +131,8 @@ SimpleRiftController::SimpleRiftController( uint32_t _riftnumber )
debug() << "Connected to Rift (SDK: "<<OVR_VERSION_STRING<<"). Yaw correction inactive. No local user profile found." << endl;
}
} else {
error() << "could not create a Rift device - using default values (SDK: "<<OVR_VERSION_STRING<<")." << endl;
error() << "Could not create a Rift device - using default values (SDK: "<<OVR_VERSION_STRING<<")." << endl;
error() << "In some cases this happens if the Rift is NOT set to the native resolution (1280*800 in case of the first/old DevKit)." << endl;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment