diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbde03798..9ec00fa5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,8 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 include(ExternalProject)
 
+include(json_info)
+
 ##
 ## OPTIONS
 ##
diff --git a/cmake/download_test_data.cmake b/cmake/download_test_data.cmake
index 1bb998dae..224d7db2c 100644
--- a/cmake/download_test_data.cmake
+++ b/cmake/download_test_data.cmake
@@ -17,40 +17,3 @@ else()
     # create a header with the path to the downloaded test data
     file(WRITE ${CMAKE_BINARY_DIR}/include/test_data.hpp "#define TEST_DATA_DIRECTORY \"${CMAKE_BINARY_DIR}/json_test_data\"\n")
 endif()
-
-# determine the operating system (for debug and support purposes)
-find_program(UNAME_COMMAND uname)
-find_program(VER_COMMAND ver)
-find_program(LSB_RELEASE_COMMAND lsb_release)
-find_program(SW_VERS_COMMAND sw_vers)
-set(OS_VERSION_STRINGS "${CMAKE_SYSTEM}")
-if (VER_COMMAND)
-    execute_process(COMMAND ${VER_COMMAND} OUTPUT_VARIABLE VER_COMMAND_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set(OS_VERSION_STRINGS "${OS_VERSION_STRINGS}; ${VER_COMMAND_RESULT}")
-endif()
-if (SW_VERS_COMMAND)
-    execute_process(COMMAND ${SW_VERS_COMMAND} OUTPUT_VARIABLE SW_VERS_COMMAND_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-    string(REGEX REPLACE "[ ]*\n" "; " SW_VERS_COMMAND_RESULT "${SW_VERS_COMMAND_RESULT}")
-    set(OS_VERSION_STRINGS "${OS_VERSION_STRINGS}; ${SW_VERS_COMMAND_RESULT}")
-endif()
-if (LSB_RELEASE_COMMAND)
-    execute_process(COMMAND ${LSB_RELEASE_COMMAND} -a OUTPUT_VARIABLE LSB_RELEASE_COMMAND_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-    string(REGEX REPLACE "[ ]*\n" "; " LSB_RELEASE_COMMAND_RESULT "${LSB_RELEASE_COMMAND_RESULT}")
-    set(OS_VERSION_STRINGS "${OS_VERSION_STRINGS}; ${LSB_RELEASE_COMMAND_RESULT}")
-endif()
-if (UNAME_COMMAND)
-    execute_process(COMMAND ${UNAME_COMMAND} -a OUTPUT_VARIABLE UNAME_COMMAND_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-    set(OS_VERSION_STRINGS "${OS_VERSION_STRINGS}; ${UNAME_COMMAND_RESULT}")
-endif()
-
-message(STATUS "Operating system: ${OS_VERSION_STRINGS}")
-
-# determine the compiler (for debug and support purposes)
-if (MSVC)
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} OUTPUT_VARIABLE CXX_VERSION_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE CXX_VERSION_RESULT ERROR_STRIP_TRAILING_WHITESPACE)
-    set(CXX_VERSION_RESULT "${CXX_VERSION_RESULT}; MSVC_VERSION=${MSVC_VERSION}; MSVC_TOOLSET_VERSION=${MSVC_TOOLSET_VERSION}")
-else()
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE CXX_VERSION_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-string(REGEX REPLACE "[ ]*\n" "; " CXX_VERSION_RESULT "${CXX_VERSION_RESULT}")
-message(STATUS "Compiler: ${CXX_VERSION_RESULT}")
diff --git a/cmake/json_info.cmake b/cmake/json_info.cmake
new file mode 100644
index 000000000..b028a446b
--- /dev/null
+++ b/cmake/json_info.cmake
@@ -0,0 +1,51 @@
+#############################################################################
+# cmake info
+#############################################################################
+
+message(STATUS "[nohmann_json]: CMake ${CMAKE_VERSION}")
+
+#############################################################################
+# system info
+#############################################################################
+
+set(distrib_name "")
+if(CMAKE_VERSION VERSION_EQUAL "3.22" OR CMAKE_VERSION VERSION_GREATER "3.22")
+    cmake_host_system_information(RESULT distrib_name QUERY DISTRIB_PRETTY_NAME)
+    if(distrib_name)
+        set(distrib_name " (${distrib_name})")
+    endif()
+endif()
+
+message(STATUS "[nohmann_json]: Host system: ${CMAKE_HOST_SYSTEM}${distrib_name}")
+if(NOT CMAKE_SYSTEM STREQUAL CMAKE_HOST_SYSTEM)
+    message(STATUS "[nohmann_json]: Target system: ${CMAKE_SYSTEM}")
+endif()
+
+if(DEFINED ENV{CI})
+    # print additional info in CI environment
+    cmake_host_system_information(RESULT num_cores QUERY NUMBER_OF_PHYSICAL_CORES)
+    cmake_host_system_information(RESULT num_threads QUERY NUMBER_OF_LOGICAL_CORES)
+    if(num_threads)
+        set(num_threads " (${num_threads})")
+    endif()
+    if(num_cores)
+        message(STATUS "[nohmann_json]: Processor cores: ${num_cores}${num_threads}")
+    endif()
+endif()
+
+#############################################################################
+# compiler info
+#############################################################################
+
+execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE cxx_version_result OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE cxx_version_result_error ERROR_STRIP_TRAILING_WHITESPACE)
+if(NOT cxx_version_result_error)
+    string(REGEX REPLACE ";" "\\\\;" cxx_version_result "${cxx_version_result}")
+    string(REGEX REPLACE "\n" ";" cxx_version_result "${cxx_version_result}")
+    list(GET cxx_version_result 0 cxx_version_result)
+    message(STATUS "[nohmann_json]: C++ compiler: ${cxx_version_result}")
+endif()
+
+if(MSVC)
+    message(STATUS "[nohmann_json]: MSVC version: ${MSVC_VERSION}")
+    message(STATUS "[nohmann_json]: MSVC toolset version: ${MSVC_TOOLSET_VERSION}")
+endif()