[{c89stringutils/c89stringutils_string_extras.h,README.md}] concat_asprintf -> jasprintf; [{CMakeLists.txt,c89stringutils/CMakeLists.txt}] Reflect newfound CMake knowledge

Author: SamuelMarks

CMakeLists.txt

@@ -1,8 +1,7 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
 project(c89stringutils VERSION 0.0.1 LANGUAGES C)
 
 set(CMAKE_C_STANDARD 90)
-cmake_policy(SET CMP0063 NEW)
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
 
@@ -41,10 +40,11 @@ include(CTest)
 enable_testing()
 add_subdirectory("c89stringutils_tests")
 
-install(
-        FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.h"
-        DESTINATION "include"
-)
+# header-only so including this will pollute the `find_path` suggestion in vcpkg
+#install(
+#        FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.h"
+#        DESTINATION "include"
+#)
 
 include(InstallRequiredSystemLibraries)
 set(CPACK_BUNDLE_NAME "${PROJECT_NAME}")
@@ -61,7 +61,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${${PROJECT_NAME}_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${${PROJECT_NAME}_VERSION_MINOR}")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/cmake/README.txt")
 set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Welcome.txt")
-set(CPACK_PACKAGE_CONTACT "https://github.com/offscale/c89stringutils")
+set(CPACK_PACKAGE_CONTACT "https://github.com/offscale/${PROJECT_NAME}")
 
 include(CPack)
 include(CMakePackageConfigHelpers)

README.md

@@ -25,7 +25,7 @@ Header only (to simplify including). Just `#define C89STRINGUTILS_IMPLEMENTATION
   | [`strerrorlen_s`](https://en.cppreference.com/w/c/string/byte/strerror) | From Safe C Library          |
   | [`asprintf`](https://www.freebsd.org/cgi/man.cgi?query=asprintf)        | From libressl-portable       |
 
-Additionally `concat_asprintf`, a version of `asprintf` that can concatenates on successive calls.
+Additionally `jasprintf`, a version of `asprintf` that concatenates on successive calls.
 
 ### Dependencies
 

c89stringutils/CMakeLists.txt

@@ -1,17 +1,17 @@
 get_filename_component(LIBRARY_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
-string(REPLACE " " "_" LIBRARY_NAME "${LIBRARY_NAME}")
 
 set(Header_Files "c89stringutils_string_extras.h")
 
 source_group("Header Files" FILES "${Header_Files}")
 
 add_library("${LIBRARY_NAME}" INTERFACE "${Header_Files}")
 
+include(GNUInstallDirs)
 target_include_directories(
         "${LIBRARY_NAME}"
         INTERFACE
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
-        "$<INSTALL_INTERFACE:include>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )
 
 set_target_properties(
@@ -27,6 +27,8 @@ if (TARGET "${DEPENDANT_LIBRARY}")
     list(APPEND installable_libs "${DEPENDANT_LIBRARY}")
 endif ()
 install(TARGETS ${installable_libs}
-        DESTINATION "${INSTALL_DEST}"
-        EXPORT "${LIBRARY_NAME}Targets")
-install(FILES ${Header_Files} DESTINATION "include")
+        EXPORT "${LIBRARY_NAME}Targets"
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(FILES ${Header_Files} TYPE "INCLUDE")