modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake

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

@@ -37,22 +37,10 @@
     else ()
         set(ICU_LIBRARIES ${IMPORT_LIBRARIES_DIR}/sicuucd.lib ${IMPORT_LIBRARIES_DIR}/icudt.lib)
         set(ICU_I18N_LIBRARIES ${IMPORT_LIBRARIES_DIR}/sicuind.lib)
     endif ()
     #### ICU-END ####
-
-    set(LIBXML2_INCLUDE_DIR ${IMPORT_INCLUDE_DIR})
-    set(LIBXML2_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libxml2_a.lib)
-
-    #### Sqlite3 ####
-    set(SQLITE_FOUND TRUE)
-    set(SQLITE_INCLUDE_DIR ${IMPORT_INCLUDE_DIR})
-    set(SQLITE_LIBRARIES ${IMPORT_LIBRARIES_DIR}/sqlite3.lib)
-    #### Sqlite3-END ####
-
-    set(LIBXSLT_INCLUDE_DIR ${IMPORT_INCLUDE_DIR})
-    set(LIBXSLT_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libxslt_a.lib)
 elseif (APPLE)
     # set(USE_CF 1)
     add_definitions(-DUSE_CF=1)
     add_definitions(-DJSC_OBJC_API_ENABLED=0)
 

@@ -62,15 +50,10 @@
     set(ICU_INCLUDE_DIRS ${IMPORT_INCLUDE_DIR})
     set(ICU_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libicuuc.a ${IMPORT_LIBRARIES_DIR}/libicudata.a)
     set(ICU_I18N_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libicui18n.a)
     #### ICU-END ####
 
-    #### Sqlite3 ####
-    set(SQLITE_FOUND TRUE)
-    set(SQLITE_INCLUDE_DIR ${IMPORT_INCLUDE_DIR})
-    set(SQLITE_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libsqlite3.a)
-    #### Sqlite3-END ####
     find_package(LibXml2 2.8.0 REQUIRED)
     find_package(LibXslt 1.1.7 REQUIRED)
     set(CMAKE_SKIP_RPATH TRUE)
 elseif (UNIX)
     #### ICU ####

@@ -79,16 +62,10 @@
     set(ICU_INCLUDE_DIRS ${IMPORT_INCLUDE_DIR})
     set(ICU_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libicuuc.a ${IMPORT_LIBRARIES_DIR}/libicudata.a)
     set(ICU_I18N_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libicui18n.a)
     #### ICU-END ####
 
-    #### Sqlite3 ####
-    set(SQLITE_FOUND TRUE)
-    set(SQLITE_INCLUDE_DIR ${IMPORT_INCLUDE_DIR})
-    set(SQLITE_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libsqlite3.a)
-    #### Sqlite3-END ####
-
     find_package(LibXml2 2.7.0 REQUIRED)
     find_package(LibXslt 1.1.7 REQUIRED)
     set(CMAKE_SKIP_RPATH TRUE)
 else ()
     message(FATAL_ERROR "Set thirdparty lib, inc paths")