Skip to content

Commit bc1b468

Browse files
committed
Rebase and minor fixes
1 parent 9a7fd7f commit bc1b468

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ include(GNUInstallDirs)
3939
include(CMakePackageConfigHelpers)
4040
include(CPack)
4141

42-
add_library(beman.inplace_vector INTERFACE)
42+
add_library(beman_inplace_vector INTERFACE)
4343
# [CMAKE.LIBRARY_ALIAS]
44-
add_library(beman::inplace_vector ALIAS beman.inplace_vector)
44+
add_library(beman::beman_inplace_vector ALIAS beman_inplace_vector)
4545

4646
target_sources(
47-
beman.inplace_vector
47+
beman_inplace_vector
4848
PUBLIC
4949
FILE_SET inplace_vector_public_headers
5050
TYPE HEADERS
@@ -53,10 +53,10 @@ target_sources(
5353
"${CMAKE_CURRENT_SOURCE_DIR}/include/beman/inplace_vector/inplace_vector.hpp"
5454
)
5555
set_target_properties(
56-
beman.inplace_vector
56+
beman_inplace_vector
5757
PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON
5858
)
59-
target_compile_features(beman.inplace_vector INTERFACE cxx_std_23)
59+
target_compile_features(beman_inplace_vector INTERFACE cxx_std_23)
6060

6161
# export cmake config package
6262
set(TARGET_NAME inplace_vector)
@@ -69,7 +69,7 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME})
6969

7070
# Install the InplaceVector library to the appropriate destination
7171
install(
72-
TARGETS beman.inplace_vector
72+
TARGETS beman_inplace_vector
7373
EXPORT ${TARGETS_EXPORT_NAME}
7474
FILE_SET inplace_vector_public_headers
7575
)

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ foreach(example ${ALL_EXAMPLES})
2121
)
2222
target_link_libraries(
2323
beman.inplace_vector.examples.${example}
24-
beman::inplace_vector
24+
beman::beman_inplace_vector
2525
)
2626
add_test(NAME ${example} COMMAND beman.inplace_vector.examples.${example})
2727
endforeach()

tests/beman/inplace_vector/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@
55

66
# Tests
77
add_executable(beman.inplace_vector.test inplace_vector.test.cpp)
8-
target_link_libraries(beman.inplace_vector.test PRIVATE beman::inplace_vector)
8+
target_link_libraries(
9+
beman.inplace_vector.test
10+
PRIVATE beman::beman_inplace_vector
11+
)
912
add_test(NAME beman.inplace_vector.test COMMAND beman.inplace_vector.test)
1013

1114
# Migrated test from original implementation
1215
add_executable(beman.inplace_vector.ref-test ref_impl.test.cpp)
1316
target_link_libraries(
1417
beman.inplace_vector.ref-test
15-
PRIVATE beman::inplace_vector
18+
PRIVATE beman::beman_inplace_vector
1619
)
1720
add_test(
1821
NAME beman.inplace_vector.ref-test

0 commit comments

Comments
 (0)