diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-19 22:25:36 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-19 22:25:36 (GMT) |
| commit | b9204bad8cc2957bc0ae6201640d2972e9d4c239 (patch) | |
| tree | 6c7668606fb9b7016a01ce93993a654e95a63ef2 /CMakeLists.txt | |
| parent | 8b9ae4ba7aa509f467b97ae298642fbe1710ea36 (diff) | |
| download | uscxml-b9204bad8cc2957bc0ae6201640d2972e9d4c239.zip uscxml-b9204bad8cc2957bc0ae6201640d2972e9d4c239.tar.gz uscxml-b9204bad8cc2957bc0ae6201640d2972e9d4c239.tar.bz2 | |
Find JavaScriptCoreGTK3 as well
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7df3af..11fc485 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -665,7 +665,6 @@ if (BUILD_MINIMAL) SET(DISABLE_ALL ON) endif() - if (APPLE OR IOS) OPTION(DISABLE_AUDIOTOOLBOX "Ignore AudioToolbox" OFF) if (NOT DISABLE_AUDIOTOOLBOX AND NOT DISABLE_ALL) @@ -687,21 +686,6 @@ if (APPLE OR IOS) endif() -OPTION(DISABLE_SPIDERMONKEY "Ignore SpiderMonkey" ON) -if (NOT DISABLE_SPIDERMONKEY AND NOT DISABLE_ALL AND NOT ECMA_FOUND) - find_package(SpiderMonkey) - if (SPIDERMONKEY_FOUND) - set(ECMA_FOUND ON) - include_directories(${SPIDERMONKEY_INCLUDE_DIR}) - if (UNIX) - add_definitions(-DXP_UNIX) - endif() - list (APPEND USCXML_OPT_LIBS ${SPIDERMONKEY_LIBRARY}) - endif() -else() - set(SPIDERMONKEY_FOUND OFF) -endif() - OPTION(DISABLE_JSC "Ignore JavaScriptCore" OFF) if (NOT DISABLE_JSC AND NOT DISABLE_ALL AND NOT ECMA_FOUND) find_package(JSC) @@ -728,6 +712,21 @@ else() set(V8_FOUND OFF) endif() +OPTION(DISABLE_SPIDERMONKEY "Ignore SpiderMonkey" ON) +if (NOT DISABLE_SPIDERMONKEY AND NOT DISABLE_ALL AND NOT ECMA_FOUND) + find_package(SpiderMonkey) + if (SPIDERMONKEY_FOUND) + set(ECMA_FOUND ON) + include_directories(${SPIDERMONKEY_INCLUDE_DIR}) + if (UNIX) + add_definitions(-DXP_UNIX) + endif() + list (APPEND USCXML_OPT_LIBS ${SPIDERMONKEY_LIBRARY}) + endif() +else() + set(SPIDERMONKEY_FOUND OFF) +endif() + OPTION(DISABLE_LUA "Ignore Lua" OFF) if (NOT DISABLE_LUA AND NOT DISABLE_ALL) |