Add support for consumption by projects that use C++ modules (#65)

cursey · Feb 27, 2024 · 3f157c8 · 3f157c8
1 parent 91fbc79
commit 3f157c8
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,7 @@ option(SAFETYHOOK_BUILD_TEST "" OFF)
 option(SAFETYHOOK_BUILD_EXAMPLES "" OFF)
 option(SAFETYHOOK_AMALGAMATE "" OFF)
 option(SAFETYHOOK_FETCH_ZYDIS "" OFF)
+option(SAFETYHOOK_USE_CXXMODULES "" OFF)
 
 project(safetyhook)
 
@@ -146,6 +147,11 @@ target_link_libraries(safetyhook PUBLIC
 	Zydis
 )
 
+set(CMKR_TARGET safetyhook)
+if(SAFETYHOOK_USE_CXXMODULES)
+    target_compile_definitions(safetyhook INTERFACE SAFETYHOOK_USE_CXXMODULES)
+endif()
+
 # Target: docs
 if(SAFETYHOOK_BUILD_DOCS) # build-docs
 	set(CMKR_TARGET docs)

diff --git a/cmake.toml b/cmake.toml
@@ -8,6 +8,7 @@ SAFETYHOOK_BUILD_TEST = false
 SAFETYHOOK_BUILD_EXAMPLES = false
 SAFETYHOOK_AMALGAMATE = false
 SAFETYHOOK_FETCH_ZYDIS = false
+SAFETYHOOK_USE_CXXMODULES = false
 
 [conditions]
 build-docs = "SAFETYHOOK_BUILD_DOCS"
@@ -59,6 +60,11 @@ link-libraries = ["Zydis"]
 msvc.private-compile-options = ["/permissive-", "/W4", "/w14640"]
 clang.private-compile-options = ["-Wall", "-Wextra", "-Wshadow", "-Wnon-virtual-dtor", "-pedantic"]
 gcc.private-compile-options = ["-Wall", "-Wextra", "-Wshadow", "-Wnon-virtual-dtor", "-pedantic"]
+cmake-after = """
+if(SAFETYHOOK_USE_CXXMODULES)
+    target_compile_definitions(safetyhook INTERFACE SAFETYHOOK_USE_CXXMODULES)
+endif()
+"""
 
 [target.docs]
 condition = "build-docs"

diff --git a/include/safetyhook/allocator.hpp b/include/safetyhook/allocator.hpp
@@ -3,11 +3,15 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <memory>
 #include <mutex>
 #include <vector>
+#else
+import std.compat;
+#endif
 
 namespace safetyhook {
 class Allocator;

diff --git a/include/safetyhook/context.hpp b/include/safetyhook/context.hpp
@@ -3,7 +3,11 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
+#else
+import std.compat;
+#endif
 
 #include "safetyhook/common.hpp"
 

diff --git a/include/safetyhook/inline_hook.hpp b/include/safetyhook/inline_hook.hpp
@@ -3,12 +3,16 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <memory>
 #include <mutex>
 #include <utility>
 #include <vector>
+#else
+import std.compat;
+#endif
 
 #include "safetyhook/allocator.hpp"
 #include "safetyhook/common.hpp"

diff --git a/include/safetyhook/mid_hook.hpp b/include/safetyhook/mid_hook.hpp
@@ -3,8 +3,12 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <memory>
+#else
+import std.compat;
+#endif
 
 #include "safetyhook/allocator.hpp"
 #include "safetyhook/context.hpp"

diff --git a/include/safetyhook/os.hpp b/include/safetyhook/os.hpp
@@ -1,9 +1,13 @@
 // This is the OS abstraction layer.
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <functional>
+#else
+import std.compat;
+#endif
 
 namespace safetyhook {
 

diff --git a/include/safetyhook/utility.hpp b/include/safetyhook/utility.hpp
@@ -1,9 +1,13 @@
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <algorithm>
 #include <cstdint>
 #include <optional>
 #include <type_traits>
+#else
+import std.compat;
+#endif
 
 namespace safetyhook {
 template <typename T> constexpr void store(uint8_t* address, const T& value) {

diff --git a/include/safetyhook/vmt_hook.hpp b/include/safetyhook/vmt_hook.hpp
@@ -3,9 +3,13 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <unordered_map>
+#else
+import std.compat;
+#endif
 
 #include "safetyhook/allocator.hpp"
 #include "safetyhook/common.hpp"