Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

5 files changed, 33 insertions, 25 deletions

diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
index fcbe429c0..27d81336f 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 (TARGET jscLib)
+    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}
-)
diff --git a/Source/JavaScriptCore/shell/PlatformQt.cmake b/Source/JavaScriptCore/shell/PlatformQt.cmake
new file mode 100644
index 000000000..55640eb3a
--- /dev/null
+++ b/Source/JavaScriptCore/shell/PlatformQt.cmake
@@ -0,0 +1,5 @@
+if (QT_STATIC_BUILD)
+    list(APPEND JSC_LIBRARIES
+        ${DEPEND_STATIC_LIBS}
+    )
+endif ()