Fix handling of external fmt lib
Using an external fmt lib should cause the spdlog::spdlog target to have a dependency on fmt lib - so that a consuming project does not need to call find_package(fmt) and target_link_libraries(... fmt::fmt). To this end a new cmake option SPDLOG_FMT_EXTERNAL is introduced which makes spdlog depend on fmt lib and defines the SPDLOG_FMT_EXTERNAL macro to avoid using the bundled fmt lib. The value of SPDLOG_FMT_EXTERNAL is also stored in the installed spdlogConfig.cmake and if it is ON find_dependency() is used to ensure the fmt::fmt target is imported.
This commit is contained in:
		@@ -53,7 +53,11 @@ endif()
 | 
				
			|||||||
option(SPDLOG_BUILD_EXAMPLES "Build examples" ${SPDLOG_MASTER_PROJECT})
 | 
					option(SPDLOG_BUILD_EXAMPLES "Build examples" ${SPDLOG_MASTER_PROJECT})
 | 
				
			||||||
option(SPDLOG_BUILD_BENCH "Build benchmarks" ${SPDLOG_MASTER_PROJECT})
 | 
					option(SPDLOG_BUILD_BENCH "Build benchmarks" ${SPDLOG_MASTER_PROJECT})
 | 
				
			||||||
option(SPDLOG_BUILD_TESTS "Build tests" ${SPDLOG_MASTER_PROJECT})
 | 
					option(SPDLOG_BUILD_TESTS "Build tests" ${SPDLOG_MASTER_PROJECT})
 | 
				
			||||||
 | 
					option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if(SPDLOG_FMT_EXTERNAL)
 | 
				
			||||||
 | 
					    find_package(fmt REQUIRED CONFIG)
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_include_directories(
 | 
					target_include_directories(
 | 
				
			||||||
    spdlog
 | 
					    spdlog
 | 
				
			||||||
@@ -62,6 +66,11 @@ target_include_directories(
 | 
				
			|||||||
    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 | 
					    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if(SPDLOG_FMT_EXTERNAL)
 | 
				
			||||||
 | 
					    target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL)
 | 
				
			||||||
 | 
					    target_link_libraries(spdlog INTERFACE fmt::fmt)
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include")
 | 
					set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(SPDLOG_BUILD_EXAMPLES)
 | 
					if(SPDLOG_BUILD_EXAMPLES)
 | 
				
			||||||
@@ -85,7 +94,8 @@ set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 | 
				
			|||||||
set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}")
 | 
					set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}")
 | 
				
			||||||
set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 | 
					set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 | 
				
			||||||
set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
 | 
					set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
 | 
				
			||||||
set(project_config "${PROJECT_NAME}Config.cmake")
 | 
					set(project_config "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake")
 | 
				
			||||||
 | 
					set(targets_config "${PROJECT_NAME}Targets.cmake")
 | 
				
			||||||
set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
 | 
					set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
 | 
				
			||||||
set(targets_export_name "${PROJECT_NAME}Targets")
 | 
					set(targets_export_name "${PROJECT_NAME}Targets")
 | 
				
			||||||
set(namespace "${PROJECT_NAME}::")
 | 
					set(namespace "${PROJECT_NAME}::")
 | 
				
			||||||
@@ -98,6 +108,8 @@ write_basic_package_version_file(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# configure pkg config file
 | 
					# configure pkg config file
 | 
				
			||||||
configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY)
 | 
					configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY)
 | 
				
			||||||
 | 
					# configure spdlogConfig.cmake file
 | 
				
			||||||
 | 
					configure_file("cmake/Config.cmake.in" "${project_config}" @ONLY)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# install targets
 | 
					# install targets
 | 
				
			||||||
install(
 | 
					install(
 | 
				
			||||||
@@ -111,9 +123,9 @@ install(
 | 
				
			|||||||
    DESTINATION "${include_install_dir}"
 | 
					    DESTINATION "${include_install_dir}"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# install project version file
 | 
					# install project config and version file
 | 
				
			||||||
install(
 | 
					install(
 | 
				
			||||||
    FILES "${version_config}"
 | 
					    FILES "${project_config}" "${version_config}"
 | 
				
			||||||
    DESTINATION "${config_install_dir}"
 | 
					    DESTINATION "${config_install_dir}"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -123,19 +135,19 @@ install(
 | 
				
			|||||||
    DESTINATION "${pkgconfig_install_dir}"
 | 
					    DESTINATION "${pkgconfig_install_dir}"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# install project config file
 | 
					# install targets config file
 | 
				
			||||||
install(
 | 
					install(
 | 
				
			||||||
    EXPORT "${targets_export_name}"
 | 
					    EXPORT "${targets_export_name}"
 | 
				
			||||||
    NAMESPACE "${namespace}"
 | 
					    NAMESPACE "${namespace}"
 | 
				
			||||||
    DESTINATION "${config_install_dir}"
 | 
					    DESTINATION "${config_install_dir}"
 | 
				
			||||||
    FILE ${project_config}
 | 
					    FILE ${targets_config}
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# export build directory config file
 | 
					# export build directory targets file
 | 
				
			||||||
export(
 | 
					export(
 | 
				
			||||||
    EXPORT ${targets_export_name}
 | 
					    EXPORT ${targets_export_name}
 | 
				
			||||||
    NAMESPACE "${namespace}"
 | 
					    NAMESPACE "${namespace}"
 | 
				
			||||||
    FILE ${project_config}
 | 
					    FILE ${targets_config}
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# register project in CMake user registry
 | 
					# register project in CMake user registry
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,4 +21,11 @@
 | 
				
			|||||||
# * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 | 
					# * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 | 
				
			||||||
# *************************************************************************/
 | 
					# *************************************************************************/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					set(SPDLOG_FMT_EXTERNAL @SPDLOG_FMT_EXTERNAL@)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
 | 
					include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if(SPDLOG_FMT_EXTERNAL)
 | 
				
			||||||
 | 
					    include(CMakeFindDependencyMacro)
 | 
				
			||||||
 | 
					    find_dependency(fmt CONFIG)
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user