Skip to content

Commit a35743a

Browse files
author
David Eles
committed
Fix installation issue.
The generated header for asio was located in the build folder, but was included from a public header. It makes the install impossible. Now the file is generated into the include folder in the proper place and added to the gitignore.
1 parent 643317f commit a35743a

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ compile_commands.json
77
/*.cpp
88
/*.patch
99
/*.diff
10+
/include/execpools/asio/asio_config.hpp
1011
callgrind.*
1112
*.pbf
1213
*.o
1314
a.out
14-
*.code-workspace
15+
*.code-workspace

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ if(STDEXEC_ENABLE_ASIO)
381381
endif()
382382

383383
file(GLOB_RECURSE boost_pool_sources include/execpools/asio/*.hpp)
384-
set(STDEXEC_ASIO_CONFIG_FILE_PATH ${CMAKE_CURRENT_BINARY_DIR}/generated_include/asio)
384+
set(STDEXEC_ASIO_CONFIG_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/execpools/asio)
385385
configure_file(include/execpools/asio/asio_config.hpp.in ${STDEXEC_ASIO_CONFIG_FILE_PATH}/asio_config.hpp)
386386

387387
if(${STDEXEC_ASIO_USES_BOOST})
@@ -400,7 +400,6 @@ if(STDEXEC_ENABLE_ASIO)
400400
STDEXEC::stdexec
401401
Boost::boost
402402
)
403-
target_include_directories(stdexec_boost_pool INTERFACE ${STDEXEC_ASIO_CONFIG_FILE_PATH})
404403
elseif(${STDEXEC_ASIO_USES_STANDALONE})
405404
include(cmake/import_standalone_asio.cmake)
406405
import_standalone_asio(
@@ -416,7 +415,6 @@ if(STDEXEC_ENABLE_ASIO)
416415
STDEXEC::stdexec
417416
asio
418417
)
419-
target_include_directories(stdexec_asio_pool INTERFACE ${STDEXEC_ASIO_CONFIG_FILE_PATH})
420418
else()
421419
message(FATAL_ERROR "ASIO implementation is not configured")
422420
endif()

include/execpools/asio/asio_thread_pool.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*/
88
#pragma once
99

10-
#include <asio_config.hpp>
1110
#include <execpools/thread_pool_base.hpp>
11+
#include <execpools/asio/asio_config.hpp>
1212

1313
namespace execpools {
1414
class asio_thread_pool : public execpools::thread_pool_base<asio_thread_pool> {

0 commit comments

Comments
 (0)