Move module to include/ directory, add compiling example program for modules

Author: mikomikotaishi

CMakeLists.txt

@@ -162,9 +162,36 @@ if (NOT WIN32)
 endif()
 
 if (DPP_MODULES)
-	add_subdirectory(src/modules)
-	target_compile_definitions(dpp PUBLIC DPP_MODULES)
 	message("-- C++20 Modules support: ${Green}ENABLED${ColourReset}")
+	add_library(dpp_module)
+
+	target_sources(dpp_module
+		PUBLIC
+			FILE_SET CXX_MODULES
+			FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/dpp/dpp.cppm"
+	)
+
+	target_compile_features(dpp_module PUBLIC cxx_std_20)
+
+	target_include_directories(dpp_module PUBLIC
+		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+		$<INSTALL_INTERFACE:include>
+	)
+
+	target_link_libraries(dpp_module PUBLIC dpp)
+
+	add_library(dpp::module ALIAS dpp_module)
+
+	# Installation
+	install(TARGETS dpp_module
+		EXPORT ${PROJECT_NAME}Targets
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		FILE_SET CXX_MODULES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dpp/include
+	)
+
+	target_compile_definitions(dpp PUBLIC DPP_MODULES)
 else()
 	message("-- C++20 Modules support: ${Red}DISABLED${ColourReset} (enable with -DDPP_MODULES=ON)")
 endif()

include/dpp/dpp.cppm

@@ -0,0 +1,67 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+module;
+
+// Include the entire standard library so it doesn't cause issue in our headers
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+
+#include <algorithm>
+#include <charconv>
+#include <condition_variable>
+#include <cstddef>
+#include <ctime>
+#include <deque>
+#include <exception>
+#include <fstream>
+#include <functional>
+#include <iomanip>
+#include <iostream>
+#include <locale>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <queue>
+#include <shared_mutex>
+#include <sstream>
+#include <string>
+#include <string_view>
+#include <thread>
+#include <type_traits>
+#include <unordered_map>
+#include <variant>
+#include <vector>
+
+#include <dpp/export.h>
+#include <dpp/compat.h>
+
+export module dpp;
+
+export extern "C++" {
+    #include <dpp/dpp.h>
+    #include <dpp/dns.h>
+    #include <dpp/restrequest.h>
+    #include <dpp/unicode_emoji.h>
+}

include/dpp/nlohmann/json.hpp

@@ -18033,8 +18033,8 @@ boundaries compute_boundaries(FloatType value)
 //
 //      -e <= 60   or   e >= -60 := alpha
 
-constexpr int kAlpha = -60;
-constexpr int kGamma = -32;
+inline constexpr int kAlpha = -60;
+inline constexpr int kGamma = -32;
 
 struct cached_power // c = f * 2^e ~= 10^k
 {

src/dpp/utility.cpp

@@ -465,7 +465,7 @@ void exec(const std::string& cmd, std::vector<std::string> parameters, cmd_resul
 			}
 			/* Capture stderr */
 			cmd_and_parameters << " 2>&1";
-			std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd_and_parameters.str().c_str(), "r"), pclose);
+			std::unique_ptr<FILE, int(*)(FILE*)> pipe(popen(cmd_and_parameters.str().c_str(), "r"), pclose);
 			if (!pipe) {
 				return;
 			}