diff --git a/3rd/dmath/dmath b/3rd/dmath/dmath index beced4f4..9b231236 160000 --- a/3rd/dmath/dmath +++ b/3rd/dmath/dmath @@ -1 +1 @@ -Subproject commit beced4f4f906a117b559cf7de3d8b724c74f980d +Subproject commit 9b2312366b0aa772a0e563780a2b1679599a4c17 diff --git a/3rd/libhv/CMakeLists.txt b/3rd/libhv/CMakeLists.txt index f1182896..786adf9d 100644 --- a/3rd/libhv/CMakeLists.txt +++ b/3rd/libhv/CMakeLists.txt @@ -37,4 +37,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/libhv/http ${CMAKE_CURRENT_LIST_DIR}/libhv/ssl ${CMAKE_CURRENT_LIST_DIR}/libhv/cpputil +) + +target_include_directories(${PROJECT_NAME} INTERFACE + ${CMAKE_CURRENT_LIST_DIR}/include ) \ No newline at end of file diff --git a/3rd/lz4/CMakeLists.txt b/3rd/lz4/CMakeLists.txt index b700fd43..4afb61fa 100644 --- a/3rd/lz4/CMakeLists.txt +++ b/3rd/lz4/CMakeLists.txt @@ -5,7 +5,12 @@ project(lz4) set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) -include_directories(${CMAKE_CURRENT_LIST_DIR}/lz4/lib) -set(LZ4_SRC lz4/lib/lz4.c) +target_include_directories(lz4 PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/lz4/lib +) -add_library(lz4 STATIC ${LZ4_SRC}) +target_include_directories(lz4 INTERFACE + ${CMAKE_CURRENT_LIST_DIR} +) + +add_library(lz4 STATIC lz4/lib/lz4.c) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bf89d1d..9df3df41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,6 @@ endif() if(PK_ENABLE_DETERMINISM) add_subdirectory(3rd/dmath/dmath) - include_directories(BEFORE 3rd/dmath/dmath/include/public) add_definitions(-DPK_ENABLE_DETERMINISM=1) endif() @@ -56,13 +55,11 @@ endif() if(PK_BUILD_MODULE_LZ4) add_subdirectory(3rd/lz4) - include_directories(3rd/lz4) add_definitions(-DPK_BUILD_MODULE_LZ4) endif() if(PK_BUILD_MODULE_LIBHV) add_subdirectory(3rd/libhv) - include_directories(3rd/libhv/include) add_definitions(-DPK_BUILD_MODULE_LIBHV) endif() diff --git a/LICENSE b/LICENSE index 0c63f0cf..8bb81d6b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 blueloveTH +Copyright (c) 2025 blueloveTH Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal