diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 21:23:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 21:23:09 -0400 |
| commit | 03d9da9fa88ce3536d3ee090e02dce2c9ce4bc53 (patch) | |
| tree | af61c7443aff27d7a6ab99815aed53bf9b60dedc /indra/cmake | |
| parent | e952f77a505cf274ca0b3ea95b504a51e757806a (diff) | |
| parent | 6540ccd307128df192ed728ff5b25c6a6e27050c (diff) | |
pull back beta tags
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/TemplateCheck.cmake | 7 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake index 90d58d93ad..2fada2eda9 100644 --- a/indra/cmake/TemplateCheck.cmake +++ b/indra/cmake/TemplateCheck.cmake @@ -5,11 +5,10 @@ include(Python) macro (check_message_template _target) add_custom_command( TARGET ${_target} - POST_BUILD + PRE_LINK COMMAND ${PYTHON_EXECUTABLE} - ARGS ${SCRIPTS_DIR}/md5check.py - 3f19d130400c547de36278a6b6f9b028 - ${SCRIPTS_DIR}/messages/message_template.msg + ARGS ${SCRIPTS_DIR}/template_verifier.py + --mode=development --cache_master --master_url=${TEMPLATE_VERIFIER_MASTER_URL} ${TEMPLATE_VERIFIER_OPTIONS} COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py" ) endmacro (check_message_template) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 5dc0cabf03..0d7156b91d 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -41,6 +41,8 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries") endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) +set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py") +set(TEMPLATE_VERIFIER_MASTER_URL "http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg" CACHE STRING "Location of the master message template") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS ON BOOL FORCE) |