diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-03-05 21:50:30 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-03-05 21:50:30 +0000 |
| commit | 1c98687442ea92e325660bef4e4d3262d75434a7 (patch) | |
| tree | dcf81c0c8a7c57005d92a9098fd440852f9d6194 | |
| parent | 0113cfd42976c5d132aa732e9aae3e50e9e83004 (diff) | |
| download | libproxy-1c98687442ea92e325660bef4e4d3262d75434a7.tar.gz | |
cmake: small rewrite on detecting mozilla js engine.
This rewrite allows us to exactly know which of the modles we found, to
do further testing on it later on (like finding the exact version and
the like).
git-svn-id: http://libproxy.googlecode.com/svn/trunk@787 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | libproxy/cmake/modules/pacrunner_mozjs.cmk | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk index 27c0a11..7a73873 100644 --- a/libproxy/cmake/modules/pacrunner_mozjs.cmk +++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk @@ -10,17 +10,20 @@ elseif(NOT APPLE) set(MOZJS_SEARCH_ORDER "xulrunner-js;firefox-js;mozilla-js;seamonkey-js" CACHE STRING "MozJS search order") option(WITH_MOZJS "Search for MOZJS package" ON) if (WITH_MOZJS) - pkg_search_module(MOZJS ${MOZJS_SEARCH_ORDER}) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) - pkg_search_module(MOZJS2 mozilla-js>=2.0b10) - if(MOZJS2_FOUND) - add_definitions(-DHAVE_MOZJS_2) - endif(MOZJS2_FOUND) - else() - set(MOZJS_FOUND 0) - endif() + foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) + pkg_search_module(MOZJS ${MOZJSLIB}) + if(MOZJS_FOUND) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) + pkg_search_module(MOZJS2 ${MOZJSLIB}>=2.0b10) + if(MOZJS2_FOUND) + add_definitions(-DHAVE_MOZJS_2) + endif(MOZJS2_FOUND) + break() + else() + set(MOZJS_FOUND 0) + endif() + endforeach() else() set(MOZJS_FOUND 0) endif() |