diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-21 09:14:06 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-21 09:14:06 (GMT) |
| commit | 8e3cca4a153a5178a77ae6956292606563f4b8fe (patch) | |
| tree | 89537d5153690ee0d9a7b0038b1280f407f70dc3 /CMakeLists.txt | |
| parent | 794575f01ce5a6bf7e377eb815f3def5aded74f5 (diff) | |
| download | uscxml-8e3cca4a153a5178a77ae6956292606563f4b8fe.zip uscxml-8e3cca4a153a5178a77ae6956292606563f4b8fe.tar.gz uscxml-8e3cca4a153a5178a77ae6956292606563f4b8fe.tar.bz2 | |
More work on JSC implementation for ecma datamodel
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a4104fd..70d8a88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,19 +388,18 @@ if (NOT WIN32) list (APPEND USCXML_CORE_LIBS "dl") list (APPEND USCXML_CORE_LIBS "pthread") if (APPLE) - find_library(APP_SERVICES_LIBRARY ApplicationServices) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - message(FATAL_ERROR "COREFOUNDATION_LIBRARY: ${COREFOUNDATION_LIBRARY}") - list (APPEND USCXML_CORE_LIBS ${APP_SERVICES_LIBRARY}) - list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY}) - endif() - if (IOS) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY}/CoreFoundation) - find_library(SECURITY_LIBRARY Security) - list (APPEND USCXML_CORE_LIBS ${SECURITY_LIBRARY}/Security) - list (APPEND USCXML_CORE_LIBS "z") - + if (IOS) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY}/CoreFoundation) + find_library(SECURITY_LIBRARY Security) + list (APPEND USCXML_CORE_LIBS ${SECURITY_LIBRARY}/Security) + list (APPEND USCXML_CORE_LIBS "z") + else() + find_library(APP_SERVICES_LIBRARY ApplicationServices) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + list (APPEND USCXML_CORE_LIBS ${APP_SERVICES_LIBRARY}) + list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY}) + endif() endif() elseif(WIN32) list (APPEND XML_LIBRARIES "Ws2_32") @@ -447,6 +446,16 @@ list (APPEND USCXML_CORE_LIBS ${EVENT_LIBRARY}) ################################################# # Optional libraries +if (APPLE OR IOS) + find_library(JSC_LIBRARY JavaScriptCore) + if (IOS) + list (APPEND USCXML_CORE_LIBS ${JSC_LIBRARY}/JavaScriptCore) + else() + list (APPEND USCXML_CORE_LIBS ${JSC_LIBRARY}) + endif() + set(JSC_FOUND ON) +endif() + find_package(V8) if (V8_FOUND) include_directories(${V8_INCLUDE_DIR}) |