Skip to content

Commit 2741e59

Browse files
committed
build(cmake): fix export target
1 parent 6a25348 commit 2741e59

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include(cmake/Utils.cmake)
77
#
88
project(
99
stdsharp
10-
VERSION 0.4.2
10+
VERSION 0.4.2.1
1111
LANGUAGES CXX)
1212

1313
config_lib(${PROJECT_NAME} INTERFACE STD 23)
@@ -33,8 +33,6 @@ target_link_libraries(${PROJECT_NAME} INTERFACE fmt::fmt range-v3::range-v3
3333
verbose_message("Successfully added all dependencies and linked against them.")
3434

3535
target_install(
36-
${PROJECT_NAME}
37-
NAMESPACE
3836
${PROJECT_NAME}
3937
COMPATIBILITY
4038
SameMajorVersion

cmake/Utils.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ function(target_install target)
148148
verbose_message("Use default version ${ARG_VER}")
149149
endif()
150150

151+
if(NOT DEFINED ARG_NAMESPACE)
152+
set(ARG_NAMESPACE ${CMAKE_PROJECT_NAME})
153+
verbose_message("Use default namespace ${ARG_NAMESPACE}")
154+
endif()
155+
151156
install(
152157
TARGETS ${target}
153158
EXPORT ${target}Targets
@@ -181,7 +186,7 @@ function(target_install target)
181186
install(
182187
EXPORT ${target}Targets
183188
DESTINATION "${${target}_INSTALL_CMAKEDIR}"
184-
NAMESPACE ${ARG_NAMESPACE}
189+
NAMESPACE ${ARG_NAMESPACE}::
185190
COMPONENT "${target}_Development")
186191

187192
if(ARG_ARCH_INDEPENDENT)

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ set(src
2828

2929
config_lib(${PROJECT_NAME}Lib INTERFACE)
3030

31-
target_link_libraries(${PROJECT_NAME}Lib INTERFACE stdsharp
31+
target_link_libraries(${PROJECT_NAME}Lib INTERFACE stdsharp::stdsharp
3232
Catch2::Catch2WithMain)
3333

3434
config_exe(${PROJECT_NAME} EXE_SRC ${src})

0 commit comments

Comments
 (0)