diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 14:48:39 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 14:48:39 -0500 |
commit | 063edac43f90d2cb0d2b41db939bbf919a1a3217 (patch) | |
tree | bbf1d446baef80933f6be80d05734d68144ae4cc /indra/cmake | |
parent | 6f53796ccf4dc29368920a322baeaceb3fd2266f (diff) | |
parent | e7ab3da7a7f5c68e3544a64c30f011762572995a (diff) |
Automated merge with file:///Users/nat/linden/viewer-leap-daggy
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/LLTestCommand.cmake | 3 |
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) |