diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 14:43:36 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 14:43:36 -0400 |
| commit | 9fe55d340feb3b761fa15be9b7c5efb7d5f4c51f (patch) | |
| tree | bda7dd44eb8bb02e009620b8e3fc79db9a524efa /indra/cmake/LLTestCommand.cmake | |
| parent | 17f98b36d3e3bebdcb331f91fc0f542f618be71d (diff) | |
| parent | f17623d8c67a10c2d7547e40ac8442c703d107ed (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/cmake/LLTestCommand.cmake')
| -rw-r--r-- | indra/cmake/LLTestCommand.cmake | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake index fae5640493..554559edbd 100644 --- a/indra/cmake/LLTestCommand.cmake +++ b/indra/cmake/LLTestCommand.cmake @@ -1,13 +1,16 @@ -MACRO(LL_TEST_COMMAND LD_LIBRARY_PATH) +MACRO(LL_TEST_COMMAND OUTVAR LD_LIBRARY_PATH) # nat wonders how Kitware can use the term 'function' for a construct that # cannot return a value. And yet, variables you set inside a FUNCTION are # local. Try a MACRO instead. - SET(LL_TEST_COMMAND_value + SET(value ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/cmake/run_build_test.py") - IF(LD_LIBRARY_PATH) - LIST(APPEND LL_TEST_COMMAND_value "-l${LD_LIBRARY_PATH}") - ENDIF(LD_LIBRARY_PATH) - LIST(APPEND LL_TEST_COMMAND_value ${ARGN}) -##MESSAGE(STATUS "Will run: ${LL_TEST_COMMAND_value}") + FOREACH(dir ${LD_LIBRARY_PATH}) + LIST(APPEND value "-l${dir}") + ENDFOREACH(dir) + LIST(APPEND value ${ARGN}) + SET(${OUTVAR} ${value}) +##IF(LL_TEST_VERBOSE) +## MESSAGE(STATUS "LL_TEST_COMMAND: ${value}") +##ENDIF(LL_TEST_VERBOSE) ENDMACRO(LL_TEST_COMMAND) |