Merge commit '6481cc3d7534a34435e88d343eb5f499001032a0'
This commit is contained in:
@@ -23,10 +23,10 @@
|
||||
# http://academic.cleardefinition.com
|
||||
# Iowa State University HCI Graduate Program/VRAC
|
||||
#
|
||||
# Copyright Iowa State University 2009-2010
|
||||
# Copyright Iowa State University 2009-2010.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
# Only do any of the prep work if not already in a dashboard script
|
||||
if(NOT IN_DASHBOARD_SCRIPT)
|
||||
@@ -118,7 +118,7 @@ if(NOT IN_DASHBOARD_SCRIPT)
|
||||
|
||||
if(NOT "1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
|
||||
if(IS_DIRECTORY "${CMAKE_SOURCE_DIRECTORY}/.git")
|
||||
find_program(DASHBOARDSCRIPT_GIT_EXECUTABLE NAMES git)
|
||||
find_program(DASHBOARDSCRIPT_GIT_EXECUTABLE NAMES git git.cmd)
|
||||
if(DASHBOARDSCRIPT_GIT_EXECUTABLE)
|
||||
|
||||
set(UPDATE_TYPE "git")
|
||||
@@ -165,6 +165,12 @@ function(create_dashboard_scripts)
|
||||
endif()
|
||||
|
||||
set(_msg)
|
||||
|
||||
if(NOT DASHBOARDSCRIPT_BUILD_CONFIGURATION)
|
||||
set(DASHBOARDSCRIPT_BUILD_CONFIGURATION "RelWithDebInfo")
|
||||
endif()
|
||||
set(DASHBOARDSCRIPT_BUILD_CONFIGURATION "${DASHBOARDSCRIPT_BUILD_CONFIGURATION}" CACHE STRING "Build configuration to use for dashboard builds by default")
|
||||
mark_as_advanced(DASHBOARDSCRIPT_BUILD_CONFIGURATION)
|
||||
|
||||
foreach(DASHBOARDSCRIPT_DASH_TYPE Nightly Continuous Experimental)
|
||||
# If given a cache template, configure it
|
||||
|
||||
Reference in New Issue
Block a user