Skip to content

Commit c6adc57

Browse files
committed
Cleanup the cmake files
1 parent 5e6714e commit c6adc57

File tree

4 files changed

+27
-22
lines changed

4 files changed

+27
-22
lines changed

CMakeLists.txt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,20 @@ target_sources(
6767
TYPE
6868
HEADERS
6969
BASE_DIRS
70-
src
71-
include)
72-
73-
target_include_directories(
74-
beman.iterator_interface
75-
PUBLIC
76-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
77-
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
78-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}>
79-
)
70+
# XXX src
71+
${PROJECT_BINARY_DIR}/include
72+
${PROJECT_SOURCE_DIR}/include
73+
FILES
74+
${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp
75+
)
76+
77+
# target_include_directories(
78+
# beman.iterator_interface
79+
# PUBLIC
80+
# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
81+
# $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
82+
# $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}>
83+
# )
8084

8185
add_subdirectory(src/beman/iterator_interface)
8286
add_subdirectory(include/beman/iterator_interface)
@@ -100,5 +104,5 @@ add_custom_target(
100104
COMMAND mkdir -p coverage
101105
COMMAND gcovr --config gcovr.cfg .)
102106

103-
install(FILES ${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp
104-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/beman/iterator_interface)
107+
# install(FILES ${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp
108+
# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/beman/iterator_interface)

CMakePresets.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
"name": "_debug-base",
1515
"hidden": true,
1616
"cacheVariables": {
17-
"CMAKE_BUILD_TYPE": "Debug",
18-
"CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined"
17+
"CMAKE_BUILD_TYPE": "Debug"
1918
}
2019
},
2120
{
2221
"name": "_release-base",
2322
"hidden": true,
2423
"cacheVariables": {
25-
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
26-
"CMAKE_CXX_FLAGS": "-O3"
24+
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
2725
}
2826
},
2927
{

include/beman/iterator_interface/CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ target_sources(
99
beman_iterator_interface_headers
1010
TYPE
1111
HEADERS
12+
BASE_DIRS
13+
${PROJECT_BINARY_DIR}/include
14+
${PROJECT_SOURCE_DIR}/include
1215
FILES
13-
iterator_interface.hpp
14-
iterator_interface_access.hpp
15-
detail/stl_interfaces/config.hpp
16-
detail/stl_interfaces/fwd.hpp
17-
detail/stl_interfaces/iterator_interface.hpp)
16+
${CMAKE_CURRENT_SOURCE_DIR}/iterator_interface.hpp
17+
${CMAKE_CURRENT_SOURCE_DIR}/iterator_interface_access.hpp
18+
${CMAKE_CURRENT_SOURCE_DIR}/detail/stl_interfaces/config.hpp
19+
${CMAKE_CURRENT_SOURCE_DIR}/detail/stl_interfaces/fwd.hpp
20+
${CMAKE_CURRENT_SOURCE_DIR}/detail/stl_interfaces/iterator_interface.hpp)

tests/beman/iterator_interface/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ target_sources(
1515
PRIVATE FILE_SET beman_iterator_interface_tests_headers TYPE HEADERS)
1616

1717
target_link_libraries(
18-
beman.iterator_interface.tests PRIVATE beman::iterator_interface GTest::gtest
18+
beman.iterator_interface.tests PRIVATE beman::iterator_interface # XXX GTest::gtest
1919
GTest::gtest_main)
2020

2121
# [Issue #18](https://github.com/bemanproject/iterator_interface/issues/18): Re-enable ASAN run CI/clang-19.

0 commit comments

Comments
 (0)