From a289a454486da76e49e3d40984d8c6e4f8d9b4e8 Mon Sep 17 00:00:00 2001 From: Alexey Sheplyakov Date: Sun, 3 Jan 2021 10:52:03 +0400 Subject: [PATCH] cmake build: moved cl_config.h.cmake to `autoconf` So both cl_config.h.in (generated by autoconf) and cl_config.h.cmake reside in the same directory --- CMakeLists.txt | 2 +- {src => autoconf}/cl_config.h.cmake | 0 src/CMakeLists.txt | 1 + tests/CMakeLists.txt | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) rename {src => autoconf}/cl_config.h.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba2d356..4a08b08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ set(cl_config_files include/cln/config.h include/cln/host_cpu.h include/cln/intparam.h - src/cl_config.h + autoconf/cl_config.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/timing/cl_t_config.h diff --git a/src/cl_config.h.cmake b/autoconf/cl_config.h.cmake similarity index 100% rename from src/cl_config.h.cmake rename to autoconf/cl_config.h.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9602e67..2cf5341 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -986,6 +986,7 @@ target_include_directories(cln PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../autoconf ) install(TARGETS cln diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 03e50dd..5308250 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -49,6 +49,7 @@ macro(add_cln_test thename) PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_BINARY_DIR}/../src + ${CMAKE_CURRENT_BINARY_DIR}/../autoconf ) add_dependencies(test_suite ${thename}) add_dependencies(check ${thename}) -- 2.47.0