Modules

.gitignore

@@ -2,7 +2,7 @@
 out/
 **/bin/
 **/build*/
-**/lib*/
+**/lib/
 **/_build*/
 
 # CMake specific settings
@@ -12,18 +12,17 @@ CMakeUserPresets.json
 **/Testing/
 
 # IDE files
-.claude/
 .idea/
 .vs/
 .vscode/
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-.claude/
 *.swp
 *~
 _ReSharper*
+__pycache__/
 *.log
 .cache/
 compile_commands.json
@@ -63,6 +62,9 @@ pr_description.md
 /size_tests
 /tmp_benchmark
 /exterior
+
 pr.md
+
+/vc140.pdb
 /tmp/
 tmp/

CMakeLists.txt

@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 4.4) 
+
+set(CACHE{CMAKE_EXPERIMENTAL_CXX_IMPORT_STD} VALUE "f35a9ac6-8463-4d38-8eec-5d6008153e7d")
 
 include(cmake/prelude.cmake)
 
@@ -8,32 +10,46 @@ project(
     LANGUAGES CXX
 )
 
+option(GLAZE_ENABLE_MODULES "Enable modules with import std" ON) # or GLAZE_GENERATE_HEADERS ??
+
+if (GLAZE_ENABLE_MODULES)
+   set(CMAKE_CXX_MODULE_STD 1)
+endif()
+
 include(cmake/project-is-top-level.cmake)
 include(cmake/variables.cmake)
 
 if (PROJECT_IS_TOP_LEVEL)
   set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 endif()
 
-add_library(glaze_glaze INTERFACE)
+if(GLAZE_ENABLE_MODULES)
+  add_library(glaze_glaze STATIC)
+  if (PROJECT_IS_TOP_LEVEL)
+    set_target_properties(glaze_glaze PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  endif()
+  set(GLAZE_LIB_TYPE PUBLIC)
+else()
+  add_library(glaze_glaze INTERFACE)
+  set(GLAZE_LIB_TYPE INTERFACE)
+endif()
 add_library(glaze::glaze ALIAS glaze_glaze)
 
-
 if (MSVC)
   string(REGEX MATCH "\/cl(.exe)?$" matched_cl ${CMAKE_CXX_COMPILER})
   if (matched_cl)
     # for a C++ standards compliant preprocessor, not needed for clang-cl
     target_compile_options(glaze_glaze INTERFACE "/Zc:preprocessor" /permissive- /Zc:lambda)
-    
+
     if(PROJECT_IS_TOP_LEVEL)
-      target_compile_options(glaze_glaze INTERFACE 
+      target_compile_options(glaze_glaze INTERFACE
         $<$<CONFIG:Release>:/GL>
         $<$<CONFIG:MinSizeRel>:/GL>)
-      target_link_options(glaze_glaze INTERFACE 
+      target_link_options(glaze_glaze INTERFACE
         $<$<CONFIG:Release>:/LTCG /INCREMENTAL:NO>
         $<$<CONFIG:MinSizeRel>:/LTCG /INCREMENTAL:NO>)
     endif()
-   endif()
+  endif()
 else()
   # Only apply -Wno-missing-braces for C and C++ compilation to avoid breaking ISPC and other language builds
   target_compile_options(${PROJECT_NAME}_${PROJECT_NAME} INTERFACE
@@ -42,12 +58,15 @@ endif()
 
 set_property(TARGET ${PROJECT_NAME}_${PROJECT_NAME} PROPERTY EXPORT_NAME glaze)
 
-target_compile_features(${PROJECT_NAME}_${PROJECT_NAME} INTERFACE cxx_std_23)
+target_compile_features(glaze_glaze ${GLAZE_LIB_TYPE} cxx_std_23)
 target_include_directories(
-    ${PROJECT_NAME}_${PROJECT_NAME} ${warning_guard}
-    INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
+    glaze_glaze ${warning_guard}
+    PUBLIC
+      "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/modules>"
 )
 
+include(cmake/modules-files.cmake)
+
 option(glaze_INSTALL "Generate installation rules for glaze" "${PROJECT_IS_TOP_LEVEL}")
 if(glaze_INSTALL AND NOT CMAKE_SKIP_INSTALL_RULES)
   include(cmake/install-rules.cmake)
@@ -75,7 +94,7 @@ if(glaze_BUILD_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
-option(glaze_EETF_FORMAT "Enable Erlang external term format parsing" OFF)
+option(glaze_EETF_FORMAT "Enable Erlang external term format parsing" OFF) # TODO: Convert
 
 if(glaze_EETF_FORMAT)
   list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

CMakePresets.json

@@ -1,120 +1,149 @@
 {
-    "version": 3,
-    "cmakeMinimumRequired": {
-        "major": 3,
-        "minor": 23,
-        "patch": 0
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 23,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "clang-debug",
+      "displayName": "Clang Debug",
+      "description": "Debug build using Clang compiler",
+      "binaryDir": "${sourceDir}/build/debug",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_C_COMPILER": "/usr/bin/clang",
+        "CMAKE_CXX_COMPILER": "/usr/bin/clang++",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "glaze_DEVELOPER_MODE": true,
+        "BUILD_TESTING": true,
+        "glaze_BUILD_INTEROP": true,
+        "CMAKE_CXX_FLAGS": "-stdlib=libc++",
+        "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++",
+        "CMAKE_SHARED_LINKER_FLAGS": "-stdlib=libc++",
+        "CMAKE_MODULE_LINKER_FLAGS": "-stdlib=libc++"
+      }
     },
-    "configurePresets": [
-        {
-            "name": "clang-debug",
-            "displayName": "Clang Debug",
-            "description": "Debug build using Clang compiler",
-            "binaryDir": "${sourceDir}/build/debug",
-            "generator": "Ninja",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug",
-                "CMAKE_C_COMPILER": "/usr/bin/clang",
-                "CMAKE_CXX_COMPILER": "/usr/bin/clang++",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": true,
-                "glaze_DEVELOPER_MODE": true,
-                "BUILD_TESTING": true,
-                "glaze_BUILD_INTEROP": true,
-                "CMAKE_CXX_FLAGS": "-stdlib=libc++",
-                "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++",
-                "CMAKE_SHARED_LINKER_FLAGS": "-stdlib=libc++",
-                "CMAKE_MODULE_LINKER_FLAGS": "-stdlib=libc++"
-            }
-        },
-        {
-            "name": "clang-release",
-            "displayName": "Clang Release",
-            "description": "Release build using Clang compiler",
-            "binaryDir": "${sourceDir}/build/release",
-            "generator": "Ninja",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_C_COMPILER": "/usr/bin/clang",
-                "CMAKE_CXX_COMPILER": "/usr/bin/clang++",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": true,
-                "glaze_DEVELOPER_MODE": true,
-                "BUILD_TESTING": true,
-                "glaze_BUILD_INTEROP": true,
-                "CMAKE_CXX_FLAGS": "-stdlib=libc++",
-                "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++",
-                "CMAKE_SHARED_LINKER_FLAGS": "-stdlib=libc++",
-                "CMAKE_MODULE_LINKER_FLAGS": "-stdlib=libc++"
-            }
-        },
-        {
-            "name": "gcc-debug",
-            "displayName": "GCC Debug",
-            "description": "Debug build using GCC compiler",
-            "binaryDir": "${sourceDir}/build/debug-gcc",
-            "generator": "Ninja",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug",
-                "CMAKE_C_COMPILER": "/usr/bin/gcc",
-                "CMAKE_CXX_COMPILER": "/usr/bin/g++",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": true,
-                "glaze_DEVELOPER_MODE": true,
-                "BUILD_TESTING": true,
-                "glaze_BUILD_INTEROP": true
-            }
-        },
-        {
-            "name": "gcc-release",
-            "displayName": "GCC Release",
-            "description": "Release build using GCC compiler",
-            "binaryDir": "${sourceDir}/build/release-gcc",
-            "generator": "Ninja",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_C_COMPILER": "/usr/bin/gcc",
-                "CMAKE_CXX_COMPILER": "/usr/bin/g++",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": true,
-                "glaze_DEVELOPER_MODE": true,
-                "BUILD_TESTING": true,
-                "glaze_BUILD_INTEROP": true
-            }
-        }
-    ],
-    "buildPresets": [
-        {
-            "name": "clang-debug",
-            "configurePreset": "clang-debug"
-        },
-        {
-            "name": "clang-release",
-            "configurePreset": "clang-release"
-        },
-        {
-            "name": "gcc-debug",
-            "configurePreset": "gcc-debug"
-        },
-        {
-            "name": "gcc-release",
-            "configurePreset": "gcc-release"
-        }
-    ],
-    "testPresets": [
-        {
-            "name": "clang-debug",
-            "displayName": "Test Clang Debug",
-            "configurePreset": "clang-debug",
-            "output": {
-                "verbosity": "verbose",
-                "outputOnFailure": true
-            }
-        },
-        {
-            "name": "gcc-debug",
-            "displayName": "Test GCC Debug",
-            "configurePreset": "gcc-debug",
-            "output": {
-                "verbosity": "verbose",
-                "outputOnFailure": true
-            }
-        }
-    ]
+    {
+      "name": "clang-release",
+      "displayName": "Clang Release",
+      "description": "Release build using Clang compiler",
+      "binaryDir": "${sourceDir}/build/release",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_C_COMPILER": "/usr/bin/clang",
+        "CMAKE_CXX_COMPILER": "/usr/bin/clang++",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "glaze_DEVELOPER_MODE": true,
+        "BUILD_TESTING": true,
+        "glaze_BUILD_INTEROP": true,
+        "CMAKE_CXX_FLAGS": "-stdlib=libc++",
+        "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++",
+        "CMAKE_SHARED_LINKER_FLAGS": "-stdlib=libc++",
+        "CMAKE_MODULE_LINKER_FLAGS": "-stdlib=libc++"
+      }
+    },
+    {
+      "name": "gcc-debug",
+      "displayName": "GCC Debug",
+      "description": "Debug build using GCC compiler",
+      "binaryDir": "${sourceDir}/build/debug-gcc",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_C_COMPILER": "/usr/bin/gcc",
+        "CMAKE_CXX_COMPILER": "/usr/bin/g++",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "glaze_DEVELOPER_MODE": true,
+        "BUILD_TESTING": true,
+        "glaze_BUILD_INTEROP": true
+      }
+    },
+    {
+      "name": "gcc-release",
+      "displayName": "GCC Release",
+      "description": "Release build using GCC compiler",
+      "binaryDir": "${sourceDir}/build/release-gcc",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_C_COMPILER": "/usr/bin/gcc",
+        "CMAKE_CXX_COMPILER": "/usr/bin/g++",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "glaze_DEVELOPER_MODE": true,
+        "BUILD_TESTING": true,
+        "glaze_BUILD_INTEROP": true
+      }
+    },
+    {
+      "name": "windows-base",
+      "description": "Base preset for MSVC v14.52",
+      "hidden": true,
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "toolset": {
+        "value": "v145,host=x64,version=14.52"
+      }
+    },
+    {
+      "name": "x64",
+      "displayName": "x64 Debug (MSVC v14.52 Preview)",
+      "inherits": "windows-base",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "clang-debug",
+      "configurePreset": "clang-debug"
+    },
+    {
+      "name": "clang-release",
+      "configurePreset": "clang-release"
+    },
+    {
+      "name": "gcc-debug",
+      "configurePreset": "gcc-debug"
+    },
+   {
+      "name": "gcc-release",
+      "configurePreset": "gcc-release"
+   },
+   {
+      "name": "x64-build",
+      "configurePreset": "x64"
+   }
+  ],
+  "testPresets": [
+    {
+      "name": "clang-debug",
+      "displayName": "Test Clang Debug",
+      "configurePreset": "clang-debug",
+      "output": {
+        "verbosity": "verbose",
+        "outputOnFailure": true
+      }
+    },
+    {
+      "name": "gcc-debug",
+      "displayName": "Test GCC Debug",
+      "configurePreset": "gcc-debug",
+      "output": {
+        "verbosity": "verbose",
+        "outputOnFailure": true
+      }
+    }
+  ]
 }