From 048d2aec277810372919bd6b324fb562601ba9d9 Mon Sep 17 00:00:00 2001 From: Bjoern Thiel Date: Fri, 19 May 2017 09:52:27 +0200 Subject: [PATCH] CMake imported targets should be namespaced --- fmt/CMakeLists.txt | 5 +++-- test/find-package-test/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fmt/CMakeLists.txt b/fmt/CMakeLists.txt index 29e881b3..e8d585b2 100644 --- a/fmt/CMakeLists.txt +++ b/fmt/CMakeLists.txt @@ -77,14 +77,15 @@ if (FMT_INSTALL) ${PROJECT_SOURCE_DIR}/support/cmake/fmt-config.cmake.in ${project_config} INSTALL_DESTINATION ${FMT_CMAKE_DIR}) - export(TARGETS ${INSTALL_TARGETS} + export(TARGETS ${INSTALL_TARGETS} NAMESPACE fmt:: FILE ${PROJECT_BINARY_DIR}/${targets_export_name}.cmake) # Install version, config and target files. install( FILES ${project_config} ${version_config} DESTINATION ${FMT_CMAKE_DIR}) - install(EXPORT ${targets_export_name} DESTINATION ${FMT_CMAKE_DIR}) + install(EXPORT ${targets_export_name} DESTINATION ${FMT_CMAKE_DIR} + NAMESPACE fmt::) # Install the library and headers. install(TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name} diff --git a/test/find-package-test/CMakeLists.txt b/test/find-package-test/CMakeLists.txt index 1f28c30c..a2ac9cac 100644 --- a/test/find-package-test/CMakeLists.txt +++ b/test/find-package-test/CMakeLists.txt @@ -5,7 +5,7 @@ project(fmt-test) find_package(FMT REQUIRED) add_executable(library-test main.cc) -target_link_libraries(library-test fmt) +target_link_libraries(library-test fmt::fmt) if (TARGET fmt-header-only) add_executable(header-only-test main.cc)