Skip to content

Commit 454939c

Browse files
authored
CMake improvements (#369)
* Silence CMake warning by updating minimum versions. * Generate files to build directory, not source directory
1 parent 61b4eaa commit 454939c

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE.
2-
cmake_minimum_required(VERSION 2.8)
2+
cmake_minimum_required(VERSION 3.0...3.23)
33

44

55
PROJECT(lsquic C)

bin/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE.
2+
3+
include_directories(${CMAKE_CURRENT_BINARY_DIR})
24
LIST(APPEND LIBS ${EVENT_LIB})
35

46
IF(MSVC)
@@ -109,4 +111,4 @@ ELSE()
109111
CHECK_INCLUDE_FILES(regex.h HAVE_REGEX)
110112
ENDIF()
111113

112-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/test_config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/test_config.h)
114+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/test_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/test_config.h)

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE.
2-
cmake_minimum_required(VERSION 2.8)
2+
cmake_minimum_required(VERSION 3.0...3.23)
33

44
add_subdirectory(liblsquic)

src/liblsquic/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ ELSE()
107107
ENDIF()
108108

109109
ADD_CUSTOM_COMMAND(
110-
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/lsquic_versions_to_string.c
110+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lsquic_versions_to_string.c
111111
COMMAND ${PERL}
112-
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/gen-verstrs.pl ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lsquic.h ${CMAKE_CURRENT_SOURCE_DIR}/lsquic_versions_to_string.c
112+
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/gen-verstrs.pl ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lsquic.h ${CMAKE_CURRENT_BINARY_DIR}/lsquic_versions_to_string.c
113113
DEPENDS ./gen-verstrs.pl ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lsquic.h
114114
)
115-
SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} lsquic_versions_to_string.c)
115+
SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/lsquic_versions_to_string.c)
116116
SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} ls-sfparser.c)
117117

118118
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXXH_HEADER_NAME=\\\"lsquic_xxhash.h\\\"")

0 commit comments

Comments
 (0)