summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-03-06 11:15:24 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-03-06 11:15:24 -0500
commitf35a662b66e93d916fc439a155aeff6446852405 (patch)
tree884da65c01a892fdb12f6f2f69fbee90c72a4310 /indra/cmake
parentca36a06d2e994178cecfae249f7f1cc3af3554a0 (diff)
parent106bac8ed77339e7c986b3066bf96210d327898d (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/LLTestCommand.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake
index b5a0580a90..f75c23a5de 100644
--- a/indra/cmake/LLTestCommand.cmake
+++ b/indra/cmake/LLTestCommand.cmake
@@ -9,6 +9,9 @@ MACRO(LL_TEST_COMMAND OUTVAR LD_LIBRARY_PATH)
FOREACH(dir ${LD_LIBRARY_PATH})
LIST(APPEND value "-l${dir}")
ENDFOREACH(dir)
+ # Enough different tests want to be able to find CMake's PYTHON_EXECUTABLE
+ # that we should just pop it into the environment for everybody.
+ LIST(APPEND value "-DPYTHON=${PYTHON_EXECUTABLE}")
LIST(APPEND value ${ARGN})
SET(${OUTVAR} ${value})
##IF(LL_TEST_VERBOSE)