iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

CMake improvements (#369)

Browse source 
* Silence CMake warning by updating minimum versions.

* Generate files to build directory, not source directory
This commit is contained in:
Ryan A. Pavlik 2022-04-23 13:54:05 -05:00 • committed by GitHub
parent 61b4eaa64e
commit 454939cdf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,5 +1,5 @@
# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE. # Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE.
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.0...3.23)
PROJECT(lsquic C) PROJECT(lsquic C)

4
bin/CMakeLists.txt
View file

@ -1,4 +1,6 @@
# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE. # Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE.
include_directories(${CMAKE_CURRENT_BINARY_DIR})
LIST(APPEND LIBS ${EVENT_LIB}) LIST(APPEND LIBS ${EVENT_LIB})
IF(MSVC) IF(MSVC)
@ -109,4 +111,4 @@ ELSE()
CHECK_INCLUDE_FILES(regex.h HAVE_REGEX) CHECK_INCLUDE_FILES(regex.h HAVE_REGEX)
ENDIF() ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/test_config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/test_config.h) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/test_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/test_config.h)

2
src/CMakeLists.txt
View file

@ -1,4 +1,4 @@
# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE. # Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE.
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.0...3.23)
add_subdirectory(liblsquic) add_subdirectory(liblsquic)

6
src/liblsquic/CMakeLists.txt
View file

@ -107,12 +107,12 @@ ELSE()
ENDIF() ENDIF()
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/lsquic_versions_to_string.c OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lsquic_versions_to_string.c
COMMAND ${PERL} COMMAND ${PERL}
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/gen-verstrs.pl ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lsquic.h ${CMAKE_CURRENT_SOURCE_DIR}/lsquic_versions_to_string.c ARGS ${CMAKE_CURRENT_SOURCE_DIR}/gen-verstrs.pl ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lsquic.h ${CMAKE_CURRENT_BINARY_DIR}/lsquic_versions_to_string.c
DEPENDS ./gen-verstrs.pl ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lsquic.h DEPENDS ./gen-verstrs.pl ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lsquic.h
) )
SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} lsquic_versions_to_string.c) SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/lsquic_versions_to_string.c)
SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} ls-sfparser.c) SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} ls-sfparser.c)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXXH_HEADER_NAME=\\\"lsquic_xxhash.h\\\"") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXXH_HEADER_NAME=\\\"lsquic_xxhash.h\\\"")