modules/javafx.web/src/main/native/Source/WebCore/PlatformJava.cmake

rev 10478 : 8178319: Build sqlite3 from source
Reviewed-by: kcr
rev 10479 : 8178440: Build libxml2 and libxslt from source
Reviewed-by: kcr

@@ -43,10 +43,11 @@
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
     "${CMAKE_BINARY_DIR}/../../gensrc/headers/javafx.web"
     "${CMAKE_BINARY_DIR}/WebCore/generated"
     "${WTF_DIR}"
     "${WEBKIT_DIR}"
+    "${THIRDPARTY_DIR}/sqlite"
 )
 
 list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${JAVA_INCLUDE_PATH}
     ${JAVA_INCLUDE_PATH2}

@@ -171,10 +172,19 @@
 
 if (WIN32)
     list(APPEND WebCore_SOURCES
       platform/win/SystemInfo.cpp
     )
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        ${THIRDPARTY_DIR}/libxml/win32/include
+        ${THIRDPARTY_DIR}/libxml/src/include
+        ${THIRDPARTY_DIR}/libxslt
+    )
+    list(APPEND WebCore_LIBRARIES
+        XMLJava
+        XSLTJava
+    )
 elseif(APPLE)
     list(APPEND WebCore_INCLUDE_DIRECTORIES
         ${WEBCORE_DIR}/icu
         ${WEBCORE_DIR}/platform/mac
     )

@@ -194,10 +204,23 @@
     list(APPEND WebCore_SOURCES
       platform/linux/MemoryPressureHandlerLinux.cpp
     )
 endif()
 
+# System libraries are used on non windows platform
+if (NOT WIN32)
+    list(APPEND WebCore_LIBRARIES
+        ${LIBXML2_LIBRARIES}
+        ${LIBXSLT_LIBRARIES}
+    )
+
+    list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+        ${LIBXML2_INCLUDE_DIR}
+        ${LIBXSLT_INCLUDE_DIR}
+    )
+endif ()
+
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/css/mediaControlsGtk.css
 )
 
 set(WebCore_USER_AGENT_SCRIPTS

@@ -217,24 +240,13 @@
 set(WebCore_FORWARDING_HEADERS_FILES
     loader/appcache/ApplicationCacheStorage.h
 )
 
 set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/java/RenderThemeJava.cpp)
-list(APPEND WebCore_LIBRARIES
-    ${LIBXML2_LIBRARIES}
-    ${LIBXSLT_LIBRARIES}
-    ${SQLITE_LIBRARIES}
-)
 
-list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
-    ${LIBXML2_INCLUDE_DIR}
-    ${LIBXSLT_INCLUDE_DIR}
-    # ${SQLITE_INCLUDE_DIR}
-    # ${WEBP_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIRS}
-    ${JAVA_INCLUDE_PATH}
-    ${JAVA_INCLUDE_PATH2}
+list(APPEND WebCore_LIBRARIES
+    SqliteJava
 )
 
 include_directories(
     "${WebCore_INCLUDE_DIRECTORIES}"
     "${DERIVED_SOURCES_DIR}"