diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
| commit | b8e97adced58f81a52e6b76a14309d275d55c8bc (patch) | |
| tree | 9f2710cbb13093c509896f184a025ab7469c934c /indra/cmake | |
| parent | abc259618f06f69ba8e7c72cb149bcddc1bb6ddf (diff) | |
| parent | e58c809a5816383674d0f1957440fad728e88893 (diff) | |
merge changes for OPEN-39
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/TemplateCheck.cmake | 7 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/WebKitLibPlugin.cmake | 3 |
3 files changed, 7 insertions, 5 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 ed5e2dee2d..77dd34d122 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -56,6 +56,8 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) # We use this as a marker that you can try to use the proprietary libraries. 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 (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 8fb717cdb8..0f5a81c020 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,7 +67,8 @@ elseif (LINUX) QtNetwork QtGui QtCore - + qgif + qjpeg jpeg fontconfig X11 |