Ver Fonte

fix cmake

blueloveTH há 9 meses atrás
pai
commit
991f2828de
5 ficheiros alterados com 14 adições e 8 exclusões
  1. 1 1
      3rd/dmath/dmath
  2. 4 0
      3rd/libhv/CMakeLists.txt
  3. 8 3
      3rd/lz4/CMakeLists.txt
  4. 0 3
      CMakeLists.txt
  5. 1 1
      LICENSE

+ 1 - 1
3rd/dmath/dmath

@@ -1 +1 @@
-Subproject commit beced4f4f906a117b559cf7de3d8b724c74f980d
+Subproject commit 9b2312366b0aa772a0e563780a2b1679599a4c17

+ 4 - 0
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
 )

+ 8 - 3
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)

+ 0 - 3
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()
 

+ 1 - 1
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