diff options
| author | Jennifer Leech <jenn@lindenlab.com> | 2008-06-12 20:51:41 +0000 |
|---|---|---|
| committer | Jennifer Leech <jenn@lindenlab.com> | 2008-06-12 20:51:41 +0000 |
| commit | fbf15572d905799257c07d1ddfb9dea0007e89fe (patch) | |
| tree | 090041496a28250356fab7806ff5c02d929a8169 /indra/cmake/Prebuilt.cmake | |
| parent | 26a87de287544e923d08addcae4efd51125ac8c0 (diff) | |
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
Diffstat (limited to 'indra/cmake/Prebuilt.cmake')
| -rw-r--r-- | indra/cmake/Prebuilt.cmake | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index 2f4fbd05c7..33cdeeeed5 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -2,16 +2,19 @@ include(Python) -macro (use_prebuilt_library _lib) +macro (use_prebuilt_binary _binary) if (NOT STANDALONE) - exec_program(${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR} - ARGS - --install-dir=${LIBS_PREBUILT_DIR} ${_lib}/${ARCH} - RETURN_VALUE _installed - ) - if (NOT _installed) + execute_process(COMMAND ${PYTHON_EXECUTABLE} + install.py + --install-dir=${CMAKE_SOURCE_DIR}/.. + ${_binary} + WORKING_DIRECTORY ${SCRIPTS_DIR} + RESULT_VARIABLE _installed + ) + if (NOT _installed EQUAL 0) message(FATAL_ERROR - "Failed to download or unpack prebuilt ${_lib} for ${ARCH}") - endif (NOT _installed) + "Failed to download or unpack prebuilt '${_binary}'." + " Process returned ${_installed}.") + endif (NOT _installed EQUAL 0) endif (NOT STANDALONE) -endmacro (use_prebuilt_library _lib) +endmacro (use_prebuilt_binary _binary) |