Skip to content

Commit

Permalink
Merge branch 'master' of github.com:litespeedtech/ls-qpack
Browse files Browse the repository at this point in the history
  • Loading branch information
gwanglst committed Dec 19, 2023
2 parents 2b19bf4 + 4a6ff1e commit 5217927
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if(LSQPACK_XXH)
target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c)
endif()

if(MSVC)
if(WIN32)
target_include_directories(ls-qpack PUBLIC wincompat)
endif()

Expand Down Expand Up @@ -104,6 +104,6 @@ endif()

install(TARGETS ls-qpack)
install(FILES lsqpack.h lsxpack_header.h DESTINATION include)
if(MSVC)
if(WIN32)
install(DIRECTORY wincompat/sys DESTINATION include)
endif()
2 changes: 1 addition & 1 deletion bin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function(lsqpack_add_executable TARGET)
target_sources(${TARGET} PRIVATE ${TARGET}.c ../deps/xxhash/xxhash.c)
target_include_directories(${TARGET} PRIVATE ../deps/xxhash)

if(MSVC)
if(WIN32)
target_include_directories(${TARGET} PRIVATE ../wincompat)
target_link_libraries(${TARGET} PRIVATE ${GETOPT_LIB})
else()
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function(lsqpack_add_test TARGET)
target_sources(test_${TARGET} PRIVATE test_${TARGET}.c)
target_link_libraries(test_${TARGET} ls-qpack)

if(MSVC)
if(WIN32)
target_include_directories(test_${TARGET} PRIVATE ../wincompat)
target_link_libraries(test_${TARGET} ${GETOPT_LIB})
else()
Expand Down

0 comments on commit 5217927

Please sign in to comment.