Switching the library to header-only

Author: gershnik

CHANGELOG.md

@@ -10,7 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - `sys_string` can now be `normalize()`-ed to NFC and NFD.
 - It is now possible to use ICU instead of internal data/code for case conversion, grapheme
   iteration and normalization. This makes those operations a tiny bit slower but saves 
-  ~100kB in a final executable.
+  ~100kB in a final executable if you use all of them.
+
+### Changed
+
+- This library is now header only
 
 ### Fixed
 

CMakeLists.txt

@@ -36,7 +36,7 @@ if(${Python3_Interpreter_FOUND})
     file(GLOB UNICODE_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/*.py)
 
     set(UNICODE_GENERATED_FILES
-        ${CMAKE_CURRENT_LIST_DIR}/lib/src/unicode_mappings.cpp 
+        ${CMAKE_CURRENT_LIST_DIR}/lib/inc/sys_string/impl/unicode/mappings_data.h
         ${CMAKE_CURRENT_LIST_DIR}/lib/inc/sys_string/impl/unicode/mappings.h
         ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data.h
         ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data_15.h

lib/CMakeLists.txt

@@ -56,11 +56,9 @@ set(UNICODE_FILES
     ${SRCDIR}/inc/sys_string/impl/unicode/algorithms.h
     ${SRCDIR}/inc/sys_string/impl/unicode/mappings_common.h
     ${SRCDIR}/inc/sys_string/impl/unicode/mappings.h
+    ${SRCDIR}/inc/sys_string/impl/unicode/mappings_data.h
     ${SRCDIR}/inc/sys_string/impl/unicode/mappings_icu.h
 )
-set(SOURCES
-    ${SRCDIR}/src/unicode_mappings.cpp
-)
 source_group("Unicode" FILES ${UNICODE_FILES} ${SOURCES})
 
 set(UTIL_FILES
@@ -80,61 +78,27 @@ set(HEADERS
     ${UTIL_FILES}
 )
 
-add_library(${LIBNAME}_headers INTERFACE)
+add_library(${LIBNAME} INTERFACE)
 
-target_compile_features(${LIBNAME}_headers
+target_compile_features(${LIBNAME}
 INTERFACE 
     cxx_std_20
 )
 
-target_include_directories(${LIBNAME}_headers
+target_include_directories(${LIBNAME}
 INTERFACE
     $<BUILD_INTERFACE:${SRCDIR}/inc>
     $<INSTALL_INTERFACE:include>  # <prefix>/include
 )
 
-target_compile_definitions(${LIBNAME}_headers
-INTERFACE
-    $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
-)
-
-target_sources(${LIBNAME}_headers
+target_sources(${LIBNAME}
 INTERFACE 
     FILE_SET HEADERS BASE_DIRS ${SRCDIR}/inc FILES
         ${HEADERS}
 PRIVATE 
     ${HEADERS}
 )
 
-add_library(${LIBNAME}::${LIBNAME}_headers ALIAS ${LIBNAME}_headers)
-
-add_library(${LIBNAME} STATIC)
-
-set_target_properties(${LIBNAME} PROPERTIES
-    CXX_EXTENSIONS OFF
-    CXX_VISIBILITY_PRESET hidden
-    VISIBILITY_INLINES_HIDDEN ON
-)
-
-target_link_libraries(${LIBNAME} 
-PUBLIC
-    ${LIBNAME}_headers
-)
-
-target_compile_options(${LIBNAME} 
-PRIVATE
-    $<$<CXX_COMPILER_ID:MSVC>:/W4;/WX>
-    $<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-pedantic>
-    $<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-pedantic>
-    $<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-pedantic>
-)
-
-
-target_sources(${LIBNAME} 
-PRIVATE 
-    ${SOURCES}
-)
-
 add_library(${LIBNAME}::${LIBNAME} ALIAS ${LIBNAME})
 
 if (PROJECT_IS_TOP_LEVEL OR SYS_STRING_CONFIGURE_INSTALL)

lib/cmake/install.cmake

@@ -9,7 +9,7 @@
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-install(TARGETS sys_string_headers sys_string EXPORT sys_string FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(TARGETS sys_string EXPORT sys_string FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(EXPORT sys_string NAMESPACE sys_string:: FILE sys_string-exports.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/sys_string)
 
 configure_package_config_file(

lib/cmake/sys_string.pc.in

@@ -1,11 +1,10 @@
 prefix=${pcfiledir}/@FROM_PCFILEDIR_TO_PREFIX@
 exec_prefix=${prefix}
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 
 Name: sys_string
 Description: C++ string classes optimized for interoperability with external native string types.
 Version: @PROJECT_VERSION@
 Requires:
 Cflags: -I${includedir}
-Libs: -L${libdir} -lsys_string
+Libs: 

lib/inc/sys_string/impl/unicode/algorithms.h

@@ -12,6 +12,7 @@
     #include <sys_string/impl/unicode/mappings_icu.h>
 #else
     #include <sys_string/impl/unicode/mappings.h>
+    #include <sys_string/impl/unicode/mappings_data.h>
 #endif
 #include <sys_string/impl/unicode/utf_util.h>
 #include <sys_string/impl/util/iter_util.h>

lib/inc/sys_string/impl/unicode/mappings_data.h

@@ -8,8 +8,6 @@
 // https://github.com/gershnik/sys_string/blob/master/LICENSE
 //
 
-#include <sys_string/impl/unicode/mappings.h>
-
 namespace sysstr::util::unicode 
 {
 

lib/src/unicode_mappings.cpp

@@ -124,7 +124,7 @@ endif()
 
 set(LIB_TYPES " ")
 if (ICU_FOUND AND ICU_UC_FOUND)
-    list(APPEND LIB_TYPES _headers)
+    list(APPEND LIB_TYPES _icu)
 endif()
 
 foreach(STANDARD_SUFFIX ${CXX_STANDARDS})
@@ -167,7 +167,7 @@ foreach(LIB_SUFFIX ${LIB_TYPES})
         ${STORAGE_FLAG_${STORAGE_SUFFIX}}
     )
 
-    if ("${LIB_SUFFIX}" STREQUAL "_headers")
+    if ("${LIB_SUFFIX}" STREQUAL "_icu")
         target_compile_definitions(test-${TEST_SUFFIX} PRIVATE
             SYS_STRING_USE_ICU=1
         )
@@ -198,7 +198,7 @@ foreach(LIB_SUFFIX ${LIB_TYPES})
 
     target_link_libraries(test-${TEST_SUFFIX} PRIVATE
 
-        sys_string::sys_string${LIB_SUFFIX}
+        sys_string::sys_string
 
         "$<$<PLATFORM_ID:Darwin>:-framework CoreFoundation>"
         "$<$<PLATFORM_ID:Windows>:runtimeobject.lib>"

test/CMakeLists.txt

@@ -18,7 +18,7 @@
 parser = argparse.ArgumentParser()
 
 parser.add_argument('datadir')
-parser.add_argument('cppfile')
+parser.add_argument('implfile')
 parser.add_argument('hfile')
 parser.add_argument('test_grapheme_data_h')
 parser.add_argument('test_grapheme_data_15_h')
@@ -27,7 +27,7 @@
 args = parser.parse_args()
 
 datadir = Path(args.datadir)
-cppfile = Path(args.cppfile)
+implfile = Path(args.implfile)
 hfile = Path(args.hfile)
 testfiles = (
     Path(args.test_grapheme_data_h),
@@ -335,7 +335,7 @@ def main():
 ''')      
 
 
-    write_file(cppfile, f'''//THIS FILE IS GENERATED. PLEASE DO NOT EDIT DIRECTLY
+    write_file(implfile, f'''//THIS FILE IS GENERATED. PLEASE DO NOT EDIT DIRECTLY
 
 //
 // Copyright 2020 Eugene Gershnik
@@ -345,8 +345,6 @@ def main():
 // https://github.com/gershnik/sys_string/blob/master/LICENSE
 //
 
-#include <sys_string/impl/unicode/mappings.h>
-
 namespace sysstr::util::unicode 
 {{