From 454939cdf8db6e367f7463f12e5b19d92586e5d0 Mon Sep 17 00:00:00 2001
From: "Ryan A. Pavlik" <ryan.pavlik@gmail.com>
Date: Sat, 23 Apr 2022 13:54:05 -0500
Subject: [PATCH] CMake improvements (#369)

* Silence CMake warning by updating minimum versions.

* Generate files to build directory, not source directory
---
 CMakeLists.txt               | 2 +-
 bin/CMakeLists.txt           | 4 +++-
 src/CMakeLists.txt           | 2 +-
 src/liblsquic/CMakeLists.txt | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a972f3c..0e928c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # 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)
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 28f2c75..34f9cac 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc.  See LICENSE.
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 LIST(APPEND LIBS ${EVENT_LIB})
 
 IF(MSVC)
@@ -109,4 +111,4 @@ ELSE()
 CHECK_INCLUDE_FILES(regex.h HAVE_REGEX)
 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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66276a0..356322f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
 # 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)
diff --git a/src/liblsquic/CMakeLists.txt b/src/liblsquic/CMakeLists.txt
index 218d951..87fce00 100644
--- a/src/liblsquic/CMakeLists.txt
+++ b/src/liblsquic/CMakeLists.txt
@@ -107,12 +107,12 @@ ELSE()
 ENDIF()
 
 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}
-    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
 )
-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(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXXH_HEADER_NAME=\\\"lsquic_xxhash.h\\\"")