Modularize the whole project.

Switch to C++23 and enable import std;

Author: refvalue

CMakeLists.txt

@@ -1,9 +1,14 @@
 # CMakeList.txt : Top-level CMake project file, do global configuration
 # and include sub-projects here.
 #
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.30)
 
-project(cpp-essence C CXX)
+# Set experimental flag to enable `import std` support from CMake.
+# This must be enabled before C++ language support.
+set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "0e5b6991-d74f-4b3d-a41c-cf096e0b2508")
+set(CMAKE_CXX_MODULE_STD ON)
+
+project(cpp-essence CXX)
 
 option(ES_WITH_NET "Whether to include the net support." ON)
 option(ES_WITH_JNI "Whether to include JNI support." ON)
@@ -29,6 +34,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 set(ES_PUBLIC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
@@ -56,15 +62,13 @@ include(CTest)
 include(FeatureTests.cmake)
 include(Dependencies.cmake)
 
-add_subdirectory(src)
+set(ES_PACKAGING_TARGETS "")
+set(ES_PROJECT_VERSION 0.2.0)
 
-if(EMSCRIPTEN)
-    add_subdirectory(src/port/wasm)
-endif()
+add_subdirectory(src)
 
 if(ES_WITH_JNI OR ANDROID)
     add_subdirectory(src/jni)
-    add_subdirectory(src/port/jni)
 endif()
 
 if(ES_WITH_TESTS)
@@ -78,3 +82,14 @@ endif()
 if(ES_WITH_TESTS)
     add_subdirectory(lang)
 endif()
+
+include(ESPackaging)
+
+message(STATUS "ES_PACKAGING_TARGETS: ${ES_PACKAGING_TARGETS}")
+
+es_make_install_package(
+    TARGETS ${ES_PACKAGING_TARGETS}
+    PACKAGE_NAME CppEssence
+    VERSION 0.2.0
+    PATH_VARS CMAKE_INSTALL_PREFIX
+)

Dependencies.cmake

@@ -73,6 +73,20 @@ if(CMAKE_CROSSCOMPILING AND NOT EMSCRIPTEN)
     endif()
 endif()
 
+es_make_install_third_party_library(
+    nlohmann_json
+    REQUIRED
+    ${runtime_args}
+    PARALLEL_BUILD
+    SYNC_BUILD_TYPE
+    GENERATOR ${CMAKE_GENERATOR}
+    CMAKE_ARGS
+    -DJSON_BuildTests=OFF
+    ${extra_cmake_args}
+    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/third-party/json
+    INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+)
+
 es_make_install_third_party_library(
     fmt
     REQUIRED

cmake/ESLangCompiler.cmake

@@ -31,7 +31,7 @@ function(es_add_lang_resources target_name)
     endif()
 
     set(options PUBLIC INTERFACE PRIVATE)
-    set(one_value_args NAME ROOT_DIRECTORY NAMESPACE)
+    set(one_value_args NAME ROOT_DIRECTORY NAMESPACE RESULT_VARIABLE_LANG_TARGET_NAME)
     set(multi_value_args "")
     cmake_parse_arguments(PARSE_ARGV 1 ARG "${options}" "${one_value_args}" "${multi_value_args}")
     es_ensure_parameters(es_execute_process ARG NAME ROOT_DIRECTORY NAMESPACE)
@@ -41,6 +41,10 @@ function(es_add_lang_resources target_name)
     set(glob_pattern ${ARG_ROOT_DIRECTORY}/*.json)
     set(header_access_level PRIVATE)
 
+    if(ARG_RESULT_VARIABLE_LANG_TARGET_NAME)
+        set(${ARG_RESULT_VARIABLE_LANG_TARGET_NAME} ${cmrc_target_name} PARENT_SCOPE)
+    endif()
+
     if(ARG_PUBLIC)
         set(header_access_level PUBLIC)
     endif()
@@ -98,26 +102,38 @@ function(es_add_lang_resources target_name)
     set(ES_USER_NAME ${ARG_NAME})
     set(ES_USER_NAMESPACE ${ARG_NAMESPACE})
 
-    set(header_file ${output_dir}/user_globalization_${ES_USER_NAME}.hpp)
-    set(source_file ${output_dir}/user_globalization_${ES_USER_NAME}.cpp)
+    set(base_dir ${output_dir})
+    set(miu_source_file ${base_dir}/user_globalization_${ES_USER_NAME}.ixx)
+    set(private_source_file ${base_dir}/user_globalization_${ES_USER_NAME}.cpp)
 
     configure_file(
-        ${_es_lang_compiler_absolute_current_dir}/config/user_globalization.hpp.in
-        ${header_file}
+        ${_es_lang_compiler_absolute_current_dir}/config/user_globalization.ixx.in
+        ${miu_source_file}
         @ONLY
     )
 
     configure_file(
         ${_es_lang_compiler_absolute_current_dir}/config/user_globalization.cpp.in
-        ${source_file}
+        ${private_source_file}
         @ONLY
     )
 
+    get_target_property(target_type ${target_name} TYPE)
+
+    if("${target_type}" STREQUAL "EXECUTABLE")
+        set(cxx_modules_access PRIVATE)
+    elseif()
+        set(cxx_modules_access PUBLIC)
+    endif()
+
     target_sources(
         ${target_name}
+        ${cxx_modules_access}
+        FILE_SET CXX_MODULES
+        FILES ${miu_source_file}
+        BASE_DIRS ${base_dir}
         PRIVATE
-        ${header_file}
-        ${source_file}
+        ${private_source_file}
     )
 
     if(ES_WITH_EXPORTS)