Skip to content

Commit c93df9b

Browse files
authored
Use a single name for cmake find_package
@jcar87 adjusted the CMake find_package capabilities, such the config and targets work for the following: - find_package(sqlite3mc) works - target_link_libraries(xxx PRIVATE sqlite3mc::sqlite3mc_static) - OR target_link_libraries(xxx PRIVATE sqlite3mc::sqlite3mc) This is in line with current CMake convention (one may want to consider having the sqlite3mc::sqlite3mc be an alias for the static recipe if the shared one is not available).
2 parents 4510fc8 + e4b372d commit c93df9b

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,33 +360,33 @@ message("Will build ${SQLITE3MC_TARGET} as ${SQLITE3MC_LINK}")
360360

361361
include(GNUInstallDirs)
362362
INSTALL(TARGETS ${SQLITE3MC_TARGET}
363-
EXPORT ${SQLITE3MC_TARGET}Targets
363+
EXPORT sqlite3mcTargets
364364
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
365365
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
366366
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
367367
FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
368368
COMPONENT libraries
369369
)
370370

371-
install(EXPORT ${SQLITE3MC_TARGET}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${SQLITE3MC_TARGET})
371+
install(EXPORT sqlite3mcTargets NAMESPACE sqlite3mc:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sqlite3mc)
372372

373373
# Create config for find_package()
374374
include(CMakePackageConfigHelpers)
375-
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${SQLITE3MC_TARGET}ConfigVersion.cmake COMPATIBILITY SameMajorVersion)
375+
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/sqlite3mcConfigVersion.cmake COMPATIBILITY SameMajorVersion)
376376
set(SQLITE3MC_CONFIG_CONTENT "@PACKAGE_INIT@\n")
377-
string(APPEND SQLITE3MC_CONFIG_CONTENT "include(\"\${CMAKE_CURRENT_LIST_DIR}/${SQLITE3MC_TARGET}Targets.cmake\")")
378-
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SQLITE3MC_TARGET}Config.cmake.in ${SQLITE3MC_CONFIG_CONTENT})
377+
string(APPEND SQLITE3MC_CONFIG_CONTENT "include(\"\${CMAKE_CURRENT_LIST_DIR}/sqlite3mcTargets.cmake\")")
378+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/sqlite3mcConfig.cmake.in ${SQLITE3MC_CONFIG_CONTENT})
379379

380380
configure_package_config_file(
381-
${CMAKE_CURRENT_BINARY_DIR}/${SQLITE3MC_TARGET}Config.cmake.in
382-
${SQLITE3MC_TARGET}Config.cmake
383-
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${SQLITE3MC_TARGET}"
381+
${CMAKE_CURRENT_BINARY_DIR}/sqlite3mcConfig.cmake.in
382+
sqlite3mcConfig.cmake
383+
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sqlite3mc"
384384
)
385385

386386
install(FILES
387-
${CMAKE_CURRENT_BINARY_DIR}/${SQLITE3MC_TARGET}ConfigVersion.cmake
388-
${CMAKE_CURRENT_BINARY_DIR}/${SQLITE3MC_TARGET}Config.cmake
389-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${SQLITE3MC_TARGET}"
387+
${CMAKE_CURRENT_BINARY_DIR}/sqlite3mcConfigVersion.cmake
388+
${CMAKE_CURRENT_BINARY_DIR}/sqlite3mcConfig.cmake
389+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sqlite3mc"
390390
)
391391

392392
# Shell Executable project

0 commit comments

Comments
 (0)