Repository: qpid-proton Updated Branches: refs/heads/master b4fbb1504 -> fc798f550
PROTON-762: Fix Javascript bindings build - Strangely(?!) this makes it the same as all the other binding builds. Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/fc798f55 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/fc798f55 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/fc798f55 Branch: refs/heads/master Commit: fc798f550c70529c8c0159992c644bbb3d0268cb Parents: b4fbb15 Author: Andrew Stitcher <astitc...@apache.org> Authored: Thu Dec 4 18:16:31 2014 -0500 Committer: Andrew Stitcher <astitc...@apache.org> Committed: Thu Dec 4 18:18:50 2014 -0500 ---------------------------------------------------------------------- proton-c/CMakeLists.txt | 13 ------------- proton-c/bindings/CMakeLists.txt | 12 +++++++++++- 2 files changed, 11 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/fc798f55/proton-c/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt index 27bebcc..4df2843 100644 --- a/proton-c/CMakeLists.txt +++ b/proton-c/CMakeLists.txt @@ -261,19 +261,6 @@ if (SWIG_FOUND) add_subdirectory(bindings) endif (SWIG_FOUND) -# Build the JavaScript language binding. -# This is somewhat different to the other language bindings in that it does not use swig. It uses a C/C++ to -# JavaScript cross-compiler called emscripten (https://github.com/kripken/emscripten). Emscripten takes C/C++ -# and compiles it into a highly optimisable subset of JavaScript called asm.js (http://asmjs.org/) that can be -# aggressively optimised and run at near-native speed (usually between 1.5 to 10 times slower than native C/C++). -option("BUILD_JAVASCRIPT" "Build JavaScript language binding" ON) -if (BUILD_JAVASCRIPT) - find_package(Emscripten) - if (EMSCRIPTEN_FOUND) - add_subdirectory(bindings/javascript) - endif (EMSCRIPTEN_FOUND) -endif (BUILD_JAVASCRIPT) - add_subdirectory(docs/api) add_subdirectory(docs/man) add_subdirectory(../tests/tools/apps/c ../tests/tools/apps/c) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/fc798f55/proton-c/bindings/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/CMakeLists.txt b/proton-c/bindings/CMakeLists.txt index e996282..65be569 100644 --- a/proton-c/bindings/CMakeLists.txt +++ b/proton-c/bindings/CMakeLists.txt @@ -20,7 +20,7 @@ include(UseSWIG) # Add any new bindings here - the directory name must be the same as the binding name -set (BINDINGS python ruby php perl) +set (BINDINGS python ruby php perl javascript) set (BINDING_DEPS qpid-proton) @@ -87,6 +87,16 @@ if (PERLLIBS_FOUND) set (DEFAULT_PERL ON) endif (PERLLIBS_FOUND) +# Prerequisites for the javascript "binding": +# This is somewhat different to the other language bindings in that it does not use swig. It uses a C/C++ to +# JavaScript cross-compiler called emscripten (https://github.com/kripken/emscripten). Emscripten takes C/C++ +# and compiles it into a highly optimisable subset of JavaScript called asm.js (http://asmjs.org/) that can be +# aggressively optimised and run at near-native speed (usually between 1.5 to 10 times slower than native C/C++). +find_package(Emscripten) +if (EMSCRIPTEN_FOUND) + set (DEFAULT_JAVASCRIPT ON) +endif (EMSCRIPTEN_FOUND) + # Shouldn't need to modify below here when adding new language binding foreach(BINDING ${BINDINGS}) string(TOUPPER ${BINDING} UBINDING) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
