Make loading prebuilts work.
Copied indra/cmake/Prebuilt.cmake from imprudence, which fixed this issue.
This commit is contained in:
@@ -1,11 +1,44 @@
|
|||||||
# -*- cmake -*-
|
# -*- cmake -*-
|
||||||
|
|
||||||
|
include(Python)
|
||||||
|
include(FindSCP)
|
||||||
|
|
||||||
macro (use_prebuilt_binary _binary)
|
macro (use_prebuilt_binary _binary)
|
||||||
if(NOT STANDALONE)
|
if (NOT STANDALONE)
|
||||||
get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
|
if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
|
||||||
list(FIND PREBUILT_PACKAGES ${_binary} _index)
|
if(INSTALL_PROPRIETARY)
|
||||||
if(_index LESS 0)
|
include(FindSCP)
|
||||||
set_property(TARGET prepare APPEND PROPERTY PREBUILT ${_binary})
|
if(DEBUG_PREBUILT)
|
||||||
endif(_index LESS 0)
|
message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. --scp=${SCP_EXECUTABLE} ${_binary}")
|
||||||
endif(NOT STANDALONE)
|
endif(DEBUG_PREBUILT)
|
||||||
|
execute_process(COMMAND ${PYTHON_EXECUTABLE}
|
||||||
|
install.py
|
||||||
|
--install-dir=${CMAKE_SOURCE_DIR}/..
|
||||||
|
--scp=${SCP_EXECUTABLE}
|
||||||
|
${_binary}
|
||||||
|
WORKING_DIRECTORY ${SCRIPTS_DIR}
|
||||||
|
RESULT_VARIABLE ${_binary}_installed
|
||||||
|
)
|
||||||
|
else(INSTALL_PROPRIETARY)
|
||||||
|
if(DEBUG_PREBUILT)
|
||||||
|
message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. ${_binary}")
|
||||||
|
endif(DEBUG_PREBUILT)
|
||||||
|
execute_process(COMMAND ${PYTHON_EXECUTABLE}
|
||||||
|
install.py
|
||||||
|
--install-dir=${CMAKE_SOURCE_DIR}/..
|
||||||
|
${_binary}
|
||||||
|
WORKING_DIRECTORY ${SCRIPTS_DIR}
|
||||||
|
RESULT_VARIABLE ${_binary}_installed
|
||||||
|
)
|
||||||
|
endif(INSTALL_PROPRIETARY)
|
||||||
|
file(WRITE ${CMAKE_BINARY_DIR}/temp/${_binary}_installed "${${_binary}_installed}")
|
||||||
|
else(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
|
||||||
|
set(${_binary}_installed 0)
|
||||||
|
endif(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
|
||||||
|
if(NOT ${_binary}_installed EQUAL 0)
|
||||||
|
message(FATAL_ERROR
|
||||||
|
"Failed to download or unpack prebuilt '${_binary}'."
|
||||||
|
" Process returned ${${_binary}_installed}.")
|
||||||
|
endif (NOT ${_binary}_installed EQUAL 0)
|
||||||
|
endif (NOT STANDALONE)
|
||||||
endmacro (use_prebuilt_binary _binary)
|
endmacro (use_prebuilt_binary _binary)
|
||||||
|
|||||||
@@ -1331,6 +1331,13 @@ anguage Infrstructure (CLI) international standard</string>
|
|||||||
<key>url</key>
|
<key>url</key>
|
||||||
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
|
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
|
||||||
</map>
|
</map>
|
||||||
|
<key>linux64</key>
|
||||||
|
<map>
|
||||||
|
<key>md5sum</key>
|
||||||
|
<string>01573510dce7f380f44e561ef2f3dd9f</string>
|
||||||
|
<key>url</key>
|
||||||
|
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
|
||||||
|
</map>
|
||||||
<key>windows</key>
|
<key>windows</key>
|
||||||
<map>
|
<map>
|
||||||
<key>md5sum</key>
|
<key>md5sum</key>
|
||||||
|
|||||||
Reference in New Issue
Block a user