use cached file_package.py variable instead of relying on the environment f...

Edward Rudd

2014-09-17 9e61e3ca2d65e45e807e27215b5f26ac6a238cc5

 cmake/UtilityFunctions.cmake

@@ -511,12 +511,12 @@
endif()

if(EMSCRIPTEN)
    find_file(EM_FILE_PACKAGER
        file_packager.py
        HINT ENV EMSCRIPTEN
        PATH_SUFFIXES tools
    )
    function(EmscriptenCreatePackage output_file preload_map out_js_file)
        set(_emscripten_path $ENV{EMSCRIPTEN})
        if(NOT _emscripten_path)
            message(FATAL_ERROR "could not locate EMSCRIPTEN did you forget to run source emsdk_env.sh")
        endif()

        set(_data_file ${CMAKE_CURRENT_BINARY_DIR}/${output_file}.data)
        set(_preload_file ${CMAKE_CURRENT_BINARY_DIR}/${output_file}.data.js)

@@ -525,11 +525,12 @@
                ${_data_file}
                ${_preload_file}
            COMMAND
                python2 ${_emscripten_path}/tools/file_packager.py
                python2 ${EM_FILE_PACKAGER}
            ARGS
                ${_data_file}
                --preload ${preload_map}
                --js-output=${_preload_file}
                ${ARGN}
        )
        set_source_files_properties(${_data_file} ${_preload_file} PROPERTIES GENERATED TRUE)
        set(${out_js_file} ${_preload_file} PARENT_SCOPE)