diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Source/JavaScriptCore/shell | |
parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
download | qtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/JavaScriptCore/shell')
-rw-r--r-- | Source/JavaScriptCore/shell/CMakeLists.txt | 30 | ||||
-rw-r--r-- | Source/JavaScriptCore/shell/PlatformBlackBerry.cmake | 16 | ||||
-rw-r--r-- | Source/JavaScriptCore/shell/PlatformEfl.cmake | 4 | ||||
-rw-r--r-- | Source/JavaScriptCore/shell/PlatformGTK.cmake | 3 |
4 files changed, 28 insertions, 25 deletions
diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt index fcbe429c0..633ce4233 100644 --- a/Source/JavaScriptCore/shell/CMakeLists.txt +++ b/Source/JavaScriptCore/shell/CMakeLists.txt @@ -3,11 +3,15 @@ set(JSC_SOURCES ) set(JSC_LIBRARIES - WTF - JavaScriptCore ${CMAKE_DL_LIBS} + JavaScriptCore${DEBUG_SUFFIX} + WTF${DEBUG_SUFFIX} ) +if (WTF_OS_MAC_OS_X) + list(APPEND JSC_LIBRARIES edit) +endif () + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") add_definitions(-DSTATICALLY_LINKED_WITH_JavaScriptCore) endif () @@ -16,6 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) +include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) add_executable(jsc ${JSC_SOURCES}) target_link_libraries(jsc ${JSC_LIBRARIES}) set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") @@ -31,3 +36,24 @@ endif () if (SHOULD_INSTALL_JS_SHELL) install(TARGETS jsc DESTINATION "${EXEC_INSTALL_DIR}") endif () + +if (WIN32) + add_dependencies(jsc jscLib) +endif () + +if (NOT WIN32) + set(TESTB3_SOURCES + ../b3/testb3.cpp + ) + + set(TESTAIR_SOURCES + ../b3/air/testair.cpp + ) + + add_executable(testb3 ${TESTB3_SOURCES}) + target_link_libraries(testb3 ${JSC_LIBRARIES}) + + add_executable(testair ${TESTAIR_SOURCES}) + target_link_libraries(testair ${JSC_LIBRARIES}) + +endif () diff --git a/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake b/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake deleted file mode 100644 index 2ec35c885..000000000 --- a/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake +++ /dev/null @@ -1,16 +0,0 @@ -FIND_STAGING_LIBRARY(SLOG2_LIBRARY slog2) -list(APPEND JSC_LIBRARIES - ${ICUI18N_LIBRARY} - ${ICUUC_LIBRARY} - ${INTL_LIBRARY} # Required for x86 builds - ${M_LIBRARY} - ${Screen_LIBRARY} - ${WebKitPlatform_LIBRARY} - ${SLOG2_LIBRARY} -) - -if (PROFILING) - list(APPEND JSC_LIBRARIES - ${PROFILING_LIBRARY} - ) -endif () diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake deleted file mode 100644 index 1d2e8c1ad..000000000 --- a/Source/JavaScriptCore/shell/PlatformEfl.cmake +++ /dev/null @@ -1,4 +0,0 @@ -list(APPEND JSC_LIBRARIES - ${GLIB_LIBRARIES} - ${ECORE_LIBRARIES} -) diff --git a/Source/JavaScriptCore/shell/PlatformGTK.cmake b/Source/JavaScriptCore/shell/PlatformGTK.cmake deleted file mode 100644 index 623183a2b..000000000 --- a/Source/JavaScriptCore/shell/PlatformGTK.cmake +++ /dev/null @@ -1,3 +0,0 @@ -list(APPEND JSC_LIBRARIES - ${GLIB_LIBRARIES} -) |