From 6e97ead181f04c5cb4953e5e3316d7d8caf0a1ec Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 3 Mar 2011 12:05:40 -0800
Subject: Add early exit to message template check if it hasn't changed.
---
indra/cmake/TemplateCheck.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake
index fa4e387dd5..24805b4214 100644
--- a/indra/cmake/TemplateCheck.cmake
+++ b/indra/cmake/TemplateCheck.cmake
@@ -5,10 +5,10 @@ include(Python)
macro (check_message_template _target)
add_custom_command(
TARGET ${_target}
- POST_BUILD
+ PRE_LINK
COMMAND ${PYTHON_EXECUTABLE}
ARGS ${SCRIPTS_DIR}/template_verifier.py
- --mode=development --cache_master
- COMMENT "Verifying message template"
+ --mode=development --cache_master ${TEMPLATE_VERIFIER_OPTIONS}
+ COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py"
)
endmacro (check_message_template)
--
cgit v1.2.3
From 616b0a25686b0ffbc5a995a26f27d5f46efc7024 Mon Sep 17 00:00:00 2001
From: "alain@945battery-guestA-183.lindenlab.com"
<alain@945battery-guestA-183.lindenlab.com>
Date: Wed, 23 Mar 2011 10:44:39 -0700
Subject: Updated linux llqtwekit archive and fixed media webkit build and
loading (fix CHOP-545).
---
indra/cmake/WebKitLibPlugin.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 8fb717cdb8..6e8f6cec7f 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -67,7 +67,7 @@ elseif (LINUX)
QtNetwork
QtGui
QtCore
-
+ jscore
jpeg
fontconfig
X11
--
cgit v1.2.3
From 2f190297f0ff37452b3e966c0878e14a6aacc41b Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Wed, 30 Mar 2011 20:12:37 +0000
Subject: remove lib requirement not in current llqtwebkit linux archive.
---
indra/cmake/WebKitLibPlugin.cmake | 1 -
1 file changed, 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 6e8f6cec7f..b599982afb 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -67,7 +67,6 @@ elseif (LINUX)
QtNetwork
QtGui
QtCore
- jscore
jpeg
fontconfig
X11
--
cgit v1.2.3
From 926e506d0ad67e4ba9370efae60f5641c932b672 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 31 Mar 2011 16:17:12 +0000
Subject: d'oh, forgot to add back some q libs to the build when reverting to
older linux package; here they are.
---
indra/cmake/WebKitLibPlugin.cmake | 2 ++
1 file changed, 2 insertions(+)
(limited to 'indra/cmake')
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index b599982afb..0f5a81c020 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -67,6 +67,8 @@ elseif (LINUX)
QtNetwork
QtGui
QtCore
+ qgif
+ qjpeg
jpeg
fontconfig
X11
--
cgit v1.2.3
From 44ad672b9e0a5ba1eef3ef7c71da3eb887f4fe0a Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Thu, 31 Mar 2011 15:43:47 -0700
Subject: Apply server side code to message template verification onto the
viewer tree.
---
indra/cmake/TemplateCheck.cmake | 2 +-
indra/cmake/Variables.cmake | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake
index 24805b4214..2fada2eda9 100644
--- a/indra/cmake/TemplateCheck.cmake
+++ b/indra/cmake/TemplateCheck.cmake
@@ -8,7 +8,7 @@ macro (check_message_template _target)
PRE_LINK
COMMAND ${PYTHON_EXECUTABLE}
ARGS ${SCRIPTS_DIR}/template_verifier.py
- --mode=development --cache_master ${TEMPLATE_VERIFIER_OPTIONS}
+ --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)
--
cgit v1.2.3