Refactor variables and naming.

Author: davidlion

CMakeLists.txt

@@ -86,26 +86,31 @@ if(ystdlib_ENABLE_TESTS)
 endif()
 
 # We require all libraries use the same minimum version of dependencies to avoid issues.
-set(MIN_BOOST_VERSION "1.81.0")
+set(BOOST_MIN_VERSION "1.81.0")
 
-add_subdirectory(src/ystdlib)
+set(CONFIG_PATH_SUFFIX "cmake/ystdlib")
+set(CONFIG_LIBS_PATH_SUFFIX "${CONFIG_PATH_SUFFIX}/libs")
+
+# Used by libraries and must come before add_subdirectory.
+set(CONFIG_LIBS_DEST_DIR "${CMAKE_INSTALL_LIBDIR}/${CONFIG_LIBS_PATH_SUFFIX}")
+set(CONFIG_LIBS_INPUT_DIR "${PROJECT_SOURCE_DIR}/${CONFIG_LIBS_PATH_SUFFIX}")
 
-set(ystdlib_INSTALL_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/ystdlib)
+add_subdirectory(src/ystdlib)
 
 set(CONFIG_FILE_PREFIX "ystdlib-config")
+set(CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CONFIG_PATH_SUFFIX})
 set(CONFIG_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_FILE_PREFIX}.cmake")
 set(CONFIG_VERSION_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_FILE_PREFIX}-version.cmake")
+
 configure_package_config_file(
-    "${CMAKE_CURRENT_LIST_DIR}/cmake/${CONFIG_FILE_PREFIX}.cmake.in"
+    "${CMAKE_CURRENT_LIST_DIR}/${CONFIG_PATH_SUFFIX}/${CONFIG_FILE_PREFIX}.cmake.in"
     "${CONFIG_OUTPUT_PATH}"
-    INSTALL_DESTINATION "${ystdlib_INSTALL_CONFIG_DIR}"
+    INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}"
 )
-
 write_basic_package_version_file("${CONFIG_VERSION_OUTPUT_PATH}" COMPATIBILITY SameMajorVersion)
-
 install(
     FILES
         "${CONFIG_OUTPUT_PATH}"
         "${CONFIG_VERSION_OUTPUT_PATH}"
-    DESTINATION "${ystdlib_INSTALL_CONFIG_DIR}"
+    DESTINATION "${CONFIG_INSTALL_DIR}"
 )

cmake/ystdlib-helpers.cmake

@@ -66,6 +66,7 @@ function(add_cpp_library)
         set(ARG_BUILD_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src")
     endif()
 
+    set(TARGET_NAME "${ARG_NAMESPACE}_${ARG_NAME}")
     set(ALIAS_TARGET_NAME "${ARG_NAMESPACE}::${ARG_NAME}")
 
     check_if_header_only(ARG_PUBLIC_HEADERS IS_VALID_INTERFACE INVALID_HEADER_FILE)
@@ -177,55 +178,49 @@ endfunction()
 #
 # @param {string} NAME
 # @param {string} NAMESPACE
-# @param {string} [CONFIG_DEST_DIR="${CMAKE_INSTALL_LIBDIR}/cmake/${ARG_NAMESPACE}/libs"]
-# Destination to install the generated config file (`NAME-config.cmake`).
-# @param {string} [CONFIG_INPUT_DIR="${PROJECT_SOURCE_DIR}/cmake/libs"]
-# `configure_package_config_file` input file (`NAME-config.cmake.in`).
-# @param {string} [CONFIG_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}"] `configure_package_config_file`
-# output file (`NAME-config.cmake`).
+# @param {string} CONFIG_DEST_DIR Destination to install the generated config file
+# (`NAME-config.cmake`).
+# @param {string} CONFIG_INPUT_DIR `configure_package_config_file` input file
+# (`NAME-config.cmake.in`).
 function(install_library)
     set(SINGLE_VALUE_ARGS
         NAME
         NAMESPACE
         CONFIG_DEST_DIR
         CONFIG_INPUT_DIR
-        CONFIG_OUTPUT_DIR
     )
     set(REQUIRED_ARGS
         NAME
         NAMESPACE
+        CONFIG_DEST_DIR
+        CONFIG_INPUT_DIR
     )
     cmake_parse_arguments(ARG "" "${SINGLE_VALUE_ARGS}" "" ${ARGN})
     check_required_arguments_exist("${REQUIRED_ARGS}")
 
-    if(NOT DEFINED ARG_CONFIG_DEST_DIR)
-        set(ARG_CONFIG_DEST_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${ARG_NAMESPACE}/libs")
-    endif()
-
-    if(NOT DEFINED ARG_CONFIG_INPUT_DIR)
-        set(ARG_CONFIG_INPUT_DIR "${PROJECT_SOURCE_DIR}/cmake/libs")
-    endif()
-
-    if(NOT DEFINED ARG_CONFIG_OUTPUT_DIR)
-        set(ARG_CONFIG_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-    endif()
-
     set(EXPORT_NAME "${ARG_NAME}-target")
     install(TARGETS "${ARG_NAME}" EXPORT "${EXPORT_NAME}" LIBRARY ARCHIVE RUNTIME FILE_SET HEADERS)
-
+    set_target_properties(
+        "${ARG_NAME}"
+        PROPERTIES
+            OUTPUT_NAME
+                "${ARG_NAMESPACE}_${ARG_NAME}"
+    )
     install(
         EXPORT "${EXPORT_NAME}"
         DESTINATION ${ARG_CONFIG_DEST_DIR}
         NAMESPACE "${ARG_NAMESPACE}::"
     )
 
     set(CONFIG_FILE_NAME "${ARG_NAME}-config.cmake")
-    set(CONFIG_OUTPUT_PATH "${ARG_CONFIG_OUTPUT_DIR}/${CONFIG_FILE_NAME}")
     configure_package_config_file(
         "${ARG_CONFIG_INPUT_DIR}/${CONFIG_FILE_NAME}.in"
-        "${CONFIG_OUTPUT_PATH}"
+        "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_FILE_NAME}"
         INSTALL_DESTINATION "${ARG_CONFIG_DEST_DIR}"
     )
-
-    install(FILES "${CONFIG_OUTPUT_PATH}" DESTINATION "${ARG_CONFIG_DEST_DIR}")
+    install(
+        FILES
+            "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_FILE_NAME}"
+        DESTINATION "${ARG_CONFIG_DEST_DIR}"
+    )
 endfunction()

src/ystdlib/containers/CMakeLists.txt

@@ -14,4 +14,9 @@ if(ystdlib_ENABLE_TESTS)
     )
 endif()
 
-install_library(NAME containers NAMESPACE ystdlib)
+install_library(
+    NAME containers
+    NAMESPACE ystdlib
+    CONFIG_DEST_DIR "${CONFIG_LIBS_DEST_DIR}"
+    CONFIG_INPUT_DIR "${CONFIG_LIBS_INPUT_DIR}"
+)

src/ystdlib/error_handling/CMakeLists.txt

@@ -3,7 +3,7 @@ if(TARGET ystdlib::error_handling)
 endif()
 
 set(BOOST_FIND_PACKAGE_ARGS
-    "${MIN_BOOST_VERSION}"
+    "${BOOST_MIN_VERSION}"
     REQUIRED
     COMPONENTS
     headers
@@ -36,4 +36,9 @@ if(ystdlib_ENABLE_TESTS)
     )
 endif()
 
-install_library(NAME error_handling NAMESPACE ystdlib)
+install_library(
+    NAME error_handling
+    NAMESPACE ystdlib
+    CONFIG_DEST_DIR "${CONFIG_LIBS_DEST_DIR}"
+    CONFIG_INPUT_DIR "${CONFIG_LIBS_INPUT_DIR}"
+)

src/ystdlib/io_interface/CMakeLists.txt

@@ -33,4 +33,9 @@ if(ystdlib_ENABLE_TESTS)
     )
 endif()
 
-install_library(NAME io_interface NAMESPACE ystdlib)
+install_library(
+    NAME io_interface
+    NAMESPACE ystdlib
+    CONFIG_DEST_DIR "${CONFIG_LIBS_DEST_DIR}"
+    CONFIG_INPUT_DIR "${CONFIG_LIBS_INPUT_DIR}"
+)

src/ystdlib/wrapped_facade_headers/CMakeLists.txt

@@ -14,4 +14,9 @@ if(ystdlib_ENABLE_TESTS)
     )
 endif()
 
-install_library(NAME wrapped_facade_headers NAMESPACE ystdlib)
+install_library(
+    NAME wrapped_facade_headers
+    NAMESPACE ystdlib
+    CONFIG_DEST_DIR "${CONFIG_LIBS_DEST_DIR}"
+    CONFIG_INPUT_DIR "${CONFIG_LIBS_INPUT_DIR}"
+)