fix internal and external code

onecoolx · Sep 16, 2024 · 8fca312 · 8fca312
1 parent 5be897c
commit 8fca312
Show file tree

Hide file tree

Showing 15 changed files with 2,570 additions and 29 deletions.
diff --git a/3rdparty/3rdparty.cmake b/3rdparty/3rdparty.cmake
@@ -3,10 +3,14 @@
 # Copyright (C) 2024 Zhang Ji Peng
 # Contact: onecoolx@gmail.com
 
-#include (${CMAKE_CURRENT_LIST_DIR}/zlib.cmake)
-#include (${CMAKE_CURRENT_LIST_DIR}/png.cmake)
-#include (${CMAKE_CURRENT_LIST_DIR}/jpeg.cmake)
-#include (${CMAKE_CURRENT_LIST_DIR}/mbedtls.cmake)
-#include (${CMAKE_CURRENT_LIST_DIR}/curl.cmake)
+if (NOT OPT_USE_INTERNAL_LIBS)
+include (${CMAKE_CURRENT_LIST_DIR}/zlib.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/png.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/jpeg.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/mbedtls.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/curl.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/xml2.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/xslt.cmake)
+endif()
 
 include (${CMAKE_CURRENT_LIST_DIR}/picasso.cmake)
diff --git a/3rdparty/curl.cmake b/3rdparty/curl.cmake
@@ -15,10 +15,15 @@ ExternalProject_Add(
   PREFIX "${PROJ_OUT}/${CURL_NAME}"
   URL "${CURL_PACKAGE}"
   URL_HASH SHA256=${CURL_HASH}
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+    "${PROJ_ROOT}/packages/patchs/${CURL_NAME}-${CURL_VERSION}/CMakeLists.txt" "${PROJ_OUT}/${CURL_NAME}/src/${CURL_NAME}/"
   BUILD_IN_SOURCE
-  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_MBEDTLS=ON -DCMAKE_INSTALL_PREFIX=${PROJ_OUT}
+  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_MBEDTLS=ON -DCMAKE_INSTALL_PREFIX=${PROJ_OUT} -DMBEDTLS_INCLUDE_DIRS=${PROJ_OUT}/include
 )
+
 include_directories(${PROJ_OUT}/include)
 link_directories(${PROJ_OUT}/lib)
 
 add_dependencies(${CURL_NAME} ${ZLIB_NAME} ${MTLS_NAME})
+
+set(LIB_DEPS curl-d ${LIB_DEPS})
diff --git a/3rdparty/jpeg.cmake b/3rdparty/jpeg.cmake
@@ -19,3 +19,4 @@ ExternalProject_Add(
   CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DWITH_JPEG8=TRUE -DENABLE_STATIC=TRUE -DENABLE_SHARED=FALSE -DCMAKE_INSTALL_PREFIX=${PROJ_OUT}
 )
 
+set(LIB_DEPS ${LIB_DEPS} jpeg turbojpeg)
diff --git a/3rdparty/mbedtls.cmake b/3rdparty/mbedtls.cmake
@@ -20,3 +20,8 @@ ExternalProject_Add(
   BUILD_IN_SOURCE
   CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${PROJ_OUT}
 )
+
+include_directories(${PROJ_OUT}/include)
+link_directories(${PROJ_OUT}/lib)
+
+set(LIB_DEPS ${LIB_DEPS} mbedtls-static mbedcrypto p256m mbedx509 everest)
diff --git a/3rdparty/png.cmake b/3rdparty/png.cmake
@@ -23,3 +23,4 @@ link_directories(${PROJ_OUT}/lib)
 
 add_dependencies(${PNG_NAME} ${ZLIB_NAME})
 
+set(LIB_DEPS ${LIB_DEPS} png)
diff --git a/3rdparty/xml2.cmake b/3rdparty/xml2.cmake
@@ -0,0 +1,26 @@
+# HTML5 runtime
+# 
+# Copyright (C) 2024 Zhang Ji Peng
+# Contact: onecoolx@gmail.com
+
+include(ExternalProject)
+
+set(XML2_NAME "libxml2")
+set(XML2_VERSION "2.13.2")
+set(XML2_PACKAGE "${PROJ_ROOT}/packages/${XML2_NAME}-${XML2_VERSION}.tar.gz")
+set(XML2_HASH "a7da2ef965770b6777c4ae136798254bf37037b656dc2eeb4bd30b50e6acd275")
+
+ExternalProject_Add(
+  ${XML2_NAME}
+  PREFIX "${PROJ_OUT}/${XML2_NAME}"
+  URL "${XML2_PACKAGE}"
+  URL_HASH SHA256=${XML2_HASH}
+  BUILD_IN_SOURCE
+  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_DEBUG=OFF -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_TESTS=OFF -DLIBXML2_WITH_ZLIB=ON -DLIBXML2_WITH_PROGRAMS=OFF -DCMAKE_INSTALL_PREFIX=${PROJ_OUT}
+)
+include_directories(${PROJ_OUT}/include/libxml2)
+link_directories(${PROJ_OUT}/lib)
+
+add_dependencies(${XML2_NAME} ${ZLIB_NAME})
+
+set(LIB_DEPS ${LIB_DEPS} xml2)
diff --git a/3rdparty/xslt.cmake b/3rdparty/xslt.cmake
@@ -0,0 +1,28 @@
+# HTML5 runtime
+# 
+# Copyright (C) 2024 Zhang Ji Peng
+# Contact: onecoolx@gmail.com
+
+include(ExternalProject)
+
+set(XSLT_NAME "libxslt")
+set(XSLT_VERSION "1.1.42")
+set(XSLT_PACKAGE "${PROJ_ROOT}/packages/${XSLT_NAME}-${XSLT_VERSION}.tar.gz")
+set(XSLT_HASH "b950e8c873069eb570dbc5828eed5a522fc2486edc0cc1dc01d3a360b63a8a62")
+
+ExternalProject_Add(
+  ${XSLT_NAME}
+  PREFIX "${PROJ_OUT}/${XSLT_NAME}"
+  URL "${XSLT_PACKAGE}"
+  URL_HASH SHA256=${XSLT_HASH}
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+    "${PROJ_ROOT}/packages/patchs/${XSLT_NAME}-${XSLT_VERSION}/CMakeLists.txt" "${PROJ_OUT}/${XSLT_NAME}/src/${XSLT_NAME}/"
+  BUILD_IN_SOURCE
+  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=OFF -DLIBXSLT_WITH_DEBUGGER=OFF -DLIBXSLT_WITH_PYTHON=OFF -DLIBXSLT_WITH_PROGRAMS=OFF -DLIBXSLT_WITH_TESTS=OFF -DLIBXSLT_WITH_XSLT_DEBUG=OFF -DCMAKE_INSTALL_PREFIX=${PROJ_OUT} -DLIBXML2_INCLUDE_DIRS=${PROJ_OUT}/include/libxml2
+)
+include_directories(${PROJ_OUT}/include)
+link_directories(${PROJ_OUT}/lib)
+
+add_dependencies(${XSLT_NAME} ${XML2_NAME})
+
+set(LIB_DEPS ${LIB_DEPS} xslt exslt)
diff --git a/3rdparty/zlib.cmake b/3rdparty/zlib.cmake
@@ -18,4 +18,3 @@ ExternalProject_Add(
   BUILD_IN_SOURCE
   CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DZLIB_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=${PROJ_OUT}
 )
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,18 +28,22 @@ if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build Type" FORCE)
 endif()
 
+option(OPT_USE_INTERNAL_LIBS "Build internal libs" ON)
+
 include (${CMAKE_CURRENT_LIST_DIR}/build/configs.cmake)
 include (${CMAKE_CURRENT_LIST_DIR}/build/defines.cmake)
 include (${CMAKE_CURRENT_LIST_DIR}/3rdparty/3rdparty.cmake)
+if (OPT_USE_INTERNAL_LIBS)
 include (${CMAKE_CURRENT_LIST_DIR}/dist/allinone.cmake)
+endif()
 include (${CMAKE_CURRENT_LIST_DIR}/src/src.cmake)
 include (${CMAKE_CURRENT_LIST_DIR}/test/test.cmake)
 
 option(OPT_UNITTEST "Build Unit tests" OFF)
 if (OPT_UNITTEST)
 enable_testing()
 include (${CMAKE_CURRENT_LIST_DIR}/unit_tests/unit_tests.cmake)
-endif(OPT_UNITTEST)
+endif()
 
 include(CheckIncludeFile)
 check_include_file(stdint.h HAVE_STDINT_H)