diff --git a/CMakeLists.txt b/CMakeLists.txt index 477ae42..0df6353 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,16 +67,20 @@ target_sources( TYPE HEADERS BASE_DIRS - src - include) - -target_include_directories( - beman.iterator_interface - PUBLIC - $ - $ - $ -) + # XXX src + ${PROJECT_BINARY_DIR}/include + ${PROJECT_SOURCE_DIR}/include + FILES + ${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp + ) + +# target_include_directories( +# beman.iterator_interface +# PUBLIC +# $ +# $ +# $ +# ) add_subdirectory(src/beman/iterator_interface) add_subdirectory(include/beman/iterator_interface) @@ -100,5 +104,5 @@ add_custom_target( COMMAND mkdir -p coverage COMMAND gcovr --config gcovr.cfg .) -install(FILES ${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/beman/iterator_interface) +# install(FILES ${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp +# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/beman/iterator_interface) diff --git a/CMakePresets.json b/CMakePresets.json index d035bef..ddf75df 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -14,16 +14,14 @@ "name": "_debug-base", "hidden": true, "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined" + "CMAKE_BUILD_TYPE": "Debug" } }, { "name": "_release-base", "hidden": true, "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_CXX_FLAGS": "-O3" + "CMAKE_BUILD_TYPE": "RelWithDebInfo" } }, { diff --git a/include/beman/iterator_interface/CMakeLists.txt b/include/beman/iterator_interface/CMakeLists.txt index 749ac46..281b603 100644 --- a/include/beman/iterator_interface/CMakeLists.txt +++ b/include/beman/iterator_interface/CMakeLists.txt @@ -9,9 +9,12 @@ target_sources( beman_iterator_interface_headers TYPE HEADERS + BASE_DIRS + ${PROJECT_BINARY_DIR}/include + ${PROJECT_SOURCE_DIR}/include FILES - iterator_interface.hpp - iterator_interface_access.hpp - detail/stl_interfaces/config.hpp - detail/stl_interfaces/fwd.hpp - detail/stl_interfaces/iterator_interface.hpp) + ${CMAKE_CURRENT_SOURCE_DIR}/iterator_interface.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/iterator_interface_access.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/detail/stl_interfaces/config.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/detail/stl_interfaces/fwd.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/detail/stl_interfaces/iterator_interface.hpp) diff --git a/tests/beman/iterator_interface/CMakeLists.txt b/tests/beman/iterator_interface/CMakeLists.txt index 9d2a629..3cd3b47 100644 --- a/tests/beman/iterator_interface/CMakeLists.txt +++ b/tests/beman/iterator_interface/CMakeLists.txt @@ -15,7 +15,7 @@ target_sources( PRIVATE FILE_SET beman_iterator_interface_tests_headers TYPE HEADERS) target_link_libraries( - beman.iterator_interface.tests PRIVATE beman::iterator_interface GTest::gtest + beman.iterator_interface.tests PRIVATE beman::iterator_interface # XXX GTest::gtest GTest::gtest_main) # [Issue #18](https://github.com/bemanproject/iterator_interface/issues/18): Re-enable ASAN run CI/clang-19.