diff options
| author | Zhaofeng Li <hello@zhaofeng.li> | 2021-06-13 20:37:53 -0700 |
|---|---|---|
| committer | Zhaofeng Li <hello@zhaofeng.li> | 2021-07-13 10:49:59 -0700 |
| commit | 51c8b89d0e98e9372b151caf93c862a0ec8e4dd4 (patch) | |
| tree | bac77e982f33aa3b1535f0f3e77999954900537f | |
| parent | d61d1c1fcbe8df6c40fc317bac96e2f0f375b146 (diff) | |
| download | libproxy-git-51c8b89d0e98e9372b151caf93c862a0ec8e4dd4.tar.gz | |
Improve detection of multiple pacrunners
Now that we have 4 pacrunner modules, it's pretty ugly to enumerate all
the possibilities.
| -rw-r--r-- | libproxy/cmake/modules.cmk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk index 476e9c5..6eaaa01 100644 --- a/libproxy/cmake/modules.cmk +++ b/libproxy/cmake/modules.cmk @@ -22,7 +22,9 @@ include(cmake/modules/pacrunner_duktape.cmk) # Build the pacrunner into libproxy unless we are building for multiple engines set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building more than one PR") -if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND)) + +math(EXPR NUM_PACRUNNER "${MOZJS_FOUND}+${NATUS_FOUND}+${WEBKIT_FOUND}+${DUKTAPE_FOUND}") +if(NUM_PACRUNNER GREATER 1) set(BIPR 0) endif() @@ -50,4 +52,5 @@ px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) px_module(pacrunner_duktape "${DUKTAPE_FOUND}" ${BIPR} ${DUKTAPE_LIBRARIES}) px_module(wpad_dns_alias 1 1) +message("${NUM_PACRUNNER} pacrunner(s) are enabled") message("") |