diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-05 14:18:41 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-05 14:18:41 (GMT) |
commit | b74da8d3aaf931b335b6ddf4eb11b892f8e719c5 (patch) | |
tree | da81388d179b2976083d51d734a3f47d2112f587 /Source/CTest/cmCTestSubmitCommand.cxx | |
parent | 407eac60f53141c9a20454922aef917114a88572 (diff) | |
download | CMake-b74da8d3aaf931b335b6ddf4eb11b892f8e719c5.zip CMake-b74da8d3aaf931b335b6ddf4eb11b892f8e719c5.tar.gz CMake-b74da8d3aaf931b335b6ddf4eb11b892f8e719c5.tar.bz2 |
ENH: Add default configure rules for CMake projects and add default rules for submission
Diffstat (limited to 'Source/CTest/cmCTestSubmitCommand.cxx')
-rw-r--r-- | Source/CTest/cmCTestSubmitCommand.cxx | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index 4e0d74a..b8fe466 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -50,12 +50,35 @@ bool cmCTestSubmitCommand::InitialPass( } } - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "DropMethod", "CTEST_DROP_METHOD"); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "DropSite", "CTEST_DROP_SITE"); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "DropLocation", "CTEST_DROP_LOCATION"); + const char* ctestDropMethod = m_Makefile->GetDefinition("CTEST_DROP_METHOD"); + const char* ctestDropSite = m_Makefile->GetDefinition("CTEST_DROP_SITE"); + const char* ctestDropLocation = m_Makefile->GetDefinition("CTEST_DROP_LOCATION"); + const char* ctestTriggerSite = m_Makefile->GetDefinition("CTEST_TRIGGER_SITE"); + + if ( !ctestDropMethod ) + { + ctestDropMethod = "http"; + } + if ( !ctestDropSite ) + { + ctestDropSite = "public.kitware.com"; + } + if ( !ctestDropLocation ) + { + ctestDropLocation = "/cgi-bin/HTTPUploadDartFile.cgi"; + } + if ( !ctestTriggerSite ) + { + ctestTriggerSite = "http://public.kitware.com/cgi-bin/Submit-Random-TestingResults.cgi"; + } + + m_CTest->SetCTestConfiguration("DropMethod", ctestDropMethod); + m_CTest->SetCTestConfiguration("DropSite", ctestDropSite); + m_CTest->SetCTestConfiguration("DropLocation", ctestDropLocation); + m_CTest->SetCTestConfiguration("TriggerSite", ctestTriggerSite); + m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "DropSiteUser", "CTEST_DROP_SITE_USER"); m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "DropSitePassword", "CTEST_DROP_SITE_PASSWORD"); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "TriggerSite", "CTEST_TRIGGER_SITE"); m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "ScpCommand", "CTEST_SCP_COMMAND"); cmCTestGenericHandler* handler = m_CTest->GetHandler("submit"); |