diff options
| author | McCabe Maxsted | 2010-05-17 10:57:59 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:40:53 -0500 |
| commit | f286bb2bf6f860419f73983233d4f747feb06300 (patch) | |
| tree | a1db8a48c4bf1a78788c15afa2c1e8bfaed3bda5 /linden/indra/cmake | |
| parent | Set the imprudence viewer version in xml (diff) | |
| download | meta-impy-f286bb2bf6f860419f73983233d4f747feb06300.zip meta-impy-f286bb2bf6f860419f73983233d4f747feb06300.tar.gz meta-impy-f286bb2bf6f860419f73983233d4f747feb06300.tar.bz2 meta-impy-f286bb2bf6f860419f73983233d4f747feb06300.tar.xz | |
Made CMake find the viewer version in xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/BuildVersion.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/cmake/BuildVersion.cmake b/linden/indra/cmake/BuildVersion.cmake index 60a519c..59b36ff 100644 --- a/linden/indra/cmake/BuildVersion.cmake +++ b/linden/indra/cmake/BuildVersion.cmake | |||
| @@ -5,7 +5,7 @@ include(Python) | |||
| 5 | macro (build_version _target) | 5 | macro (build_version _target) |
| 6 | execute_process( | 6 | execute_process( |
| 7 | COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/build_version.py | 7 | COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/build_version.py |
| 8 | llversion${_target}.h ${LLCOMMON_INCLUDE_DIRS} | 8 | viewerversion.xml ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/ |
| 9 | OUTPUT_VARIABLE ${_target}_VERSION | 9 | OUTPUT_VARIABLE ${_target}_VERSION |
| 10 | OUTPUT_STRIP_TRAILING_WHITESPACE | 10 | OUTPUT_STRIP_TRAILING_WHITESPACE |
| 11 | ) | 11 | ) |