trying to unify FetchContent and find_package usage

Author: dk949

CMakeLists.txt

@@ -15,15 +15,18 @@ add_library(ut INTERFACE)
 foreach (include ${includes})
     add_subdirectory("${include}")
     cmake_path(GET include FILENAME module_name)
-    target_link_libraries(ut INTERFACE "${module_name}")
-    list(APPEND LIBUT_TARGET_LIST "${module_name}")
+    target_link_libraries(ut INTERFACE ut_${module_name})
+    list(APPEND LIBUT_TARGET_LIST ut_${module_name})
 endforeach ()
+if (NOT TARGET ut::ut)
+    add_library(ut::ut ALIAS ut)
+endif ()
 list(APPEND LIBUT_TARGET_LIST ut)
 set(LIBUT_TARGET_LIST
     "${LIBUT_TARGET_LIST}"
     CACHE INTERNAL "" FORCE
 )
-message(STATUS "libut: adding UT::ut")
+message(STATUS "libut: adding ut::ut")
 libut_install()
 
 if (PROJECT_IS_TOP_LEVEL)

README.md

@@ -32,42 +32,43 @@ FetchContent_MakeAvailable(libut)
 
 # assuming MY_TARGET is a valid target (executable or library)
 
-target_link_libraries(MY_TARGET UT::target_name)
+target_link_libraries(MY_TARGET ut::target_name)
 ```
 
 ### Currently available targets
 
 <!-- AUTOGEN_BEGIN -->
 
-* `UT::ptr_containers`: containers for storing owning pointers
-* `UT::check`: type which prints when it is constructed/copied/moved/destructed
-* `UT::pair`: a better `std::pair` implementation
-* `UT::switchboard`: composable and type-safe CLI parser
-* `UT::err`: convenient error type for use with std::expected
-* `UT::add_noexcept`: add the `noexcept` specifier to a function type
-* `UT::change_observer`: wrapper class that invokes callbacks when it's held value changes
-* `UT::traced_error`: an exception type that automatically stores a C++23 standard stacktrace
-* `UT::sv_to_num`: convert `std::string_view` to a number
-* `UT::copy_traits`: copy cvref qualifiers from one type to another
-* `UT::realloc_unique_ptr`: `realloc` functionality for `std::uniqur_ptr`
-* `UT::assert`: various assertion macros
-* `UT::resource`: a more general version of `std::unique_ptr` that operates on values
-* `UT::demangle`: convert types into human readable strings
-* `UT::constexpr_hash`: a hashing function usable in `constexpr` context
-* `UT::trim`: trim characters from start and end of a `std::string_view`
-* `UT::pack_loops`: loop over variadic template parameters (either values or types)
-* `UT::asis`: Provides a more convenient way to work with different kinds of dynamically polymorphic values.
+* `ut::ptr_containers`: containers for storing owning pointers
+* `ut::check`: type which prints when it is constructed/copied/moved/destructed
+* `ut::pair`: a better `std::pair` implementation
+* `ut::switchboard`: composable and type-safe CLI parser
+* `ut::err`: convenient error type for use with std::expected
+* `ut::add_noexcept`: add the `noexcept` specifier to a function type
+* `ut::change_observer`: wrapper class that invokes callbacks when it's held value changes
+* `ut::traced_error`: an exception type that automatically stores a C++23 standard stacktrace
+* `ut::sv_to_num`: convert `std::string_view` to a number
+* `ut::copy_traits`: copy cvref qualifiers from one type to another
+* `ut::realloc_unique_ptr`: `realloc` functionality for `std::uniqur_ptr`
+* `ut::assert`: various assertion macros
+* `ut::resource`: a more general version of `std::unique_ptr` that operates on values
+* `ut::demangle`: convert types into human readable strings
+* `ut::constexpr_hash`: a hashing function usable in `constexpr` context
+* `ut::trim`: trim characters from start and end of a `std::string_view`
+* `ut::pack_loops`: loop over variadic template parameters (either values or types)
+* `ut::asis`: Provides a more convenient way to work with different kinds of dynamically polymorphic values.
 * `UT::static_string`: compile time known string usable as a template parameter
-* `UT::breakpoint`: Portable(ish) breakpoint macros
-* `UT::mt_queue`: thread safe FIFO queue
-* `UT::curry`: create a curried function out of a regular function
-* `UT::defer`: a macro to defer execution until the scope ends
-* `UT::print`: macros for printing using `std::format` in c++20
-* `UT::overload`: creates a function object merging several other function objects as an overload set
+* `ut::static_string`: compile time known string usable as a template parameter
+* `ut::breakpoint`: Portable(ish) breakpoint macros
+* `ut::mt_queue`: thread safe FIFO queue
+* `ut::curry`: create a curried function out of a regular function
+* `ut::defer`: a macro to defer execution until the scope ends
+* `ut::print`: macros for printing using `std::format` in c++20
+* `ut::overload`: creates a function object merging several other function objects as an overload set
 
 <!-- AUTOGEN_END -->
 
-A special target `UT::ut` is also available, combining all of the above.
+A special target `ut::ut` is also available, combining all of the above.
 
 ## Testing
 

cmake/targets.cmake

@@ -1,14 +1,17 @@
 macro (libut_define_target name)
-    add_library(${name} INTERFACE)
+    add_library(ut_${name} INTERFACE)
     target_sources(
-        ${name}
+        ut_${name}
         PUBLIC FILE_SET HEADERS #
                BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include #
                FILES ${ARGN}
     )
+    if (NOT TARGET ut::${name})
+        add_library(ut::${name} ALIAS ut_${name})
+    endif ()
 
-    # target_include_directories(
-    #     ${name} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>
-    # )
-    message(STATUS "libut: adding ${name}")
+    if (NOT TARGET ut::ut_${name})
+        add_library(ut::ut_${name} ALIAS ut_${name})
+    endif ()
+    message(STATUS "libut: adding ut::${name}")
 endmacro ()

scripts/update_gists

@@ -176,7 +176,7 @@ def write_cmake(name: str):
     if cmake_file.exists():
         print("file", cmake_file, "already exists", file=sys.stderr)
         return False
-    print(f"Generating CMake file for target UT::{name}")
+    print(f"Generating CMake file for target ut::{name}")
     with open(cmake_file, "w") as f:
         f.write(populate_cmake_template(name, cmake_file.parent))
 
@@ -202,7 +202,7 @@ def update_readme():
     repl = (
         [r"\1"]
         + [
-            f"* `UT::{name.name}`: {get_desc(name)}"
+            f"* `ut::{name.name}`: {get_desc(name)}"
             for name in INCLUDE.iterdir()
             if name.is_dir()
         ]