From 8a6760545055afa4007da119f8ecd9f5bde29c65 Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Thu, 31 Dec 2020 14:52:07 -0300 Subject: [PATCH 1/3] Update zstd to v1.4.8 --- externals/zstd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/zstd b/externals/zstd index 10f0e6993..97a3da1df 160000 --- a/externals/zstd +++ b/externals/zstd @@ -1 +1 @@ -Subproject commit 10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee +Subproject commit 97a3da1df009d4dc67251de0c4b1c9d7fe286fc1 From 6876f1aaa456d66989a27f020e12a6396cfd09f3 Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Thu, 31 Dec 2020 18:16:18 -0300 Subject: [PATCH 2/3] zstd: set include directory directly --- externals/CMakeLists.txt | 1 - src/common/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 389220837..bfad32b40 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -81,7 +81,6 @@ add_subdirectory(teakra EXCLUDE_FROM_ALL) # Zstandard add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL) -target_include_directories(libzstd_static INTERFACE ./zstd/lib) # ENet add_subdirectory(enet) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 5d65965fa..a765c2019 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -131,6 +131,7 @@ create_target_directory_groups(common) target_link_libraries(common PUBLIC fmt microprofile Boost::boost Boost::serialization) target_link_libraries(common PRIVATE libzstd_static) +target_include_directories(common PRIVATE ${CMAKE_SOURCE_DIR}/externals/zstd/lib) if (ARCHITECTURE_x86_64) target_link_libraries(common PRIVATE xbyak) endif() From a6fbc1c9e3bad8a21f714253ab0bd52d0d6291d4 Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Fri, 1 Jan 2021 03:04:10 -0300 Subject: [PATCH 3/3] zstd: define include_directories for build interface only --- externals/CMakeLists.txt | 1 + src/common/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index bfad32b40..24e881b19 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -81,6 +81,7 @@ add_subdirectory(teakra EXCLUDE_FROM_ALL) # Zstandard add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL) +target_include_directories(libzstd_static INTERFACE $) # ENet add_subdirectory(enet) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index a765c2019..5d65965fa 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -131,7 +131,6 @@ create_target_directory_groups(common) target_link_libraries(common PUBLIC fmt microprofile Boost::boost Boost::serialization) target_link_libraries(common PRIVATE libzstd_static) -target_include_directories(common PRIVATE ${CMAKE_SOURCE_DIR}/externals/zstd/lib) if (ARCHITECTURE_x86_64) target_link_libraries(common PRIVATE xbyak) endif()