fix: compilation with BUILD_SHARED_LIBS with MSVC

Nerixyz · Nerixyz · commit 0e76e48eb472 · 2024-12-28T17:29:17.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
             apple-clang *
           standards: '20'
           latest-factors: |
-            msvc Optimized-Debug
+            msvc Optimized-Debug Shared
             gcc Coverage
           factors: ''
           runs-on: |
@@ -375,6 +375,7 @@ jobs:
           package-dir: packages
           package-generators: ${{ matrix.mrdocs-package-generators }}
           package-artifact: false
+          shared: ${{ matrix.shared }}
 
       - name: Check YAML schema
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -292,10 +292,10 @@ if (WIN32)
         target_compile_options(
             mrdocs-core
             PUBLIC
-            /permissive-    # strict C++
-            /W4             # enable all warnings
-            /MP             # multi-processor compilation
-            /EHs            # C++ Exception handling
+            /permissive-                    # strict C++
+            /W4                             # enable all warnings
+            $<$<CXX_COMPILER_ID:MSVC>:/MP>  # multi-processor compilation
+            /EHs                            # C++ Exception handling
         )
     endif()
 endif ()
@@ -325,7 +325,6 @@ list(APPEND TOOL_SOURCES
         ${CMAKE_CURRENT_BINARY_DIR}/src/tool/PublicToolArgs.cpp)
 
 add_executable(mrdocs ${TOOL_SOURCES})
-target_compile_definitions(mrdocs PRIVATE -DMRDOCS_TOOL)
 
 target_include_directories(mrdocs
     PUBLIC
@@ -337,7 +336,6 @@ target_include_directories(mrdocs
     "${PROJECT_BINARY_DIR}/src"
 )
 
-target_compile_definitions(mrdocs PRIVATE -DMRDOCS_TOOL)
 target_link_libraries(mrdocs PUBLIC mrdocs-core)
 if (MRDOCS_CLANG)
     target_compile_options(
diff --git a/include/mrdocs/Config.hpp b/include/mrdocs/Config.hpp
@@ -60,7 +60,7 @@ class MRDOCS_DECL
 public:
     /** Settings values used to generate the Corpus and Docs
      */
-    struct Settings : public PublicSettings
+    struct MRDOCS_DECL Settings : public PublicSettings
     {
         /**
          * @brief Loads the public configuration settings from the specified YAML file.
@@ -156,13 +156,11 @@ class MRDOCS_DECL
 
     /** Destructor.
     */
-    MRDOCS_DECL
     virtual
     ~Config() noexcept = 0;
 
     /** Return a pool of threads for executing work.
     */
-    MRDOCS_DECL
     virtual
     ThreadPool&
     threadPool() const noexcept = 0;
diff --git a/include/mrdocs/Dom/Array.hpp b/include/mrdocs/Dom/Array.hpp
@@ -281,6 +281,7 @@ class MRDOCS_DECL
     /** Return a diagnostic string.
     */
     friend
+    MRDOCS_DECL
     std::string
     toString(Array const&);
 
@@ -364,6 +365,13 @@ class MRDOCS_DECL
     DefaultArrayImpl();
     explicit DefaultArrayImpl(
         storage_type elements) noexcept;
+
+    DefaultArrayImpl(const DefaultArrayImpl&);
+    DefaultArrayImpl(DefaultArrayImpl&&);
+    DefaultArrayImpl& operator=(const DefaultArrayImpl&);
+    DefaultArrayImpl& operator=(DefaultArrayImpl&&);
+    ~DefaultArrayImpl();
+    
     size_type size() const override;
     value_type get(size_type i) const override;
     void set(size_type i, Value v) override;
diff --git a/include/mrdocs/Dom/Object.hpp b/include/mrdocs/Dom/Object.hpp
@@ -318,7 +318,7 @@ class MRDOCS_DECL
 
     /** Return a diagnostic string.
     */
-    friend std::string toString(Object const&);
+    friend MRDOCS_DECL std::string toString(Object const&);
 };
 
 //------------------------------------------------
@@ -402,6 +402,11 @@ class MRDOCS_DECL
 {
 public:
     DefaultObjectImpl() noexcept;
+    DefaultObjectImpl(const DefaultObjectImpl&);
+    DefaultObjectImpl(DefaultObjectImpl&&);
+    DefaultObjectImpl& operator=(const DefaultObjectImpl&);
+    DefaultObjectImpl& operator=(DefaultObjectImpl&&);
+    ~DefaultObjectImpl();
 
     explicit DefaultObjectImpl(
         storage_type entries) noexcept;
diff --git a/include/mrdocs/Dom/Value.hpp b/include/mrdocs/Dom/Value.hpp
@@ -46,9 +46,11 @@ namespace mrdocs {
 
     @see https://handlebarsjs.com/api-reference/utilities.html#handlebars-safestring-string
  */
+MRDOCS_DECL
 dom::Value
 safeString(std::string_view str);
 
+MRDOCS_DECL
 dom::Value
 safeString(dom::Value const& str);
 
@@ -523,6 +525,7 @@ class MRDOCS_DECL
     /** Return value as a string.
     */
     friend
+    MRDOCS_DECL
     std::string
     toString(Value const& value);
 };
diff --git a/include/mrdocs/Metadata/Javadoc.hpp b/include/mrdocs/Metadata/Javadoc.hpp
@@ -371,6 +371,12 @@ struct Copied : Reference
 struct MRDOCS_DECL
     Block : Node
 {
+    Block(const Block&) = delete;
+    Block(Block&&);
+    Block& operator=(const Block&) = delete;
+    Block& operator=(Block&&);
+    ~Block();
+
     List<Text> children;
 
     bool isBlock() const noexcept final
@@ -919,7 +925,6 @@ class MRDOCS_DECL
 public:
     /** Constructor.
     */
-    MRDOCS_DECL
     Javadoc() noexcept;
 
     /** Constructor
@@ -928,6 +933,11 @@ class MRDOCS_DECL
     Javadoc(
         doc::List<doc::Block> blocks);
 
+    Javadoc(const Javadoc&) = delete;
+    Javadoc(Javadoc&&);
+    Javadoc& operator=(const Javadoc&) = delete;
+    Javadoc& operator=(Javadoc&&);
+
     /** Return true if this is empty
     */
     bool
diff --git a/include/mrdocs/Platform.hpp b/include/mrdocs/Platform.hpp
@@ -11,7 +11,6 @@
 #ifndef MRDOCS_API_PLATFORM_HPP
 #define MRDOCS_API_PLATFORM_HPP
 
-#include <mrdocs/Support/Assert.hpp>
 #include <type_traits>
 
 #if __cplusplus < 202002L
@@ -79,4 +78,6 @@ namespace mrdocs {
 } // mrdocs
 } // clang
 
+#include <mrdocs/Support/Assert.hpp>
+
 #endif
diff --git a/include/mrdocs/Support/Assert.hpp b/include/mrdocs/Support/Assert.hpp
@@ -11,6 +11,7 @@
 #ifndef MRDOCS_API_SUPPORT_ASSERT_HPP
 #define MRDOCS_API_SUPPORT_ASSERT_HPP
 
+#include <mrdocs/Platform.hpp>
 #include <cstdint>
 
 namespace clang {
@@ -30,6 +31,7 @@ namespace mrdocs {
         #define MRDOCS_UNREACHABLE() static_cast<void>(__debugbreak(), __assume(false))
     #endif
 
+    MRDOCS_DECL
     void
     assert_failed(
         const char* msg,
diff --git a/include/mrdocs/Support/JavaScript.hpp b/include/mrdocs/Support/JavaScript.hpp
@@ -414,7 +414,7 @@ class MRDOCS_DECL Value
         via @ref Scope::reset.
 
      */
-    MRDOCS_DECL ~Value();
+    ~Value();
 
     /** Constructor
 
@@ -424,36 +424,36 @@ class MRDOCS_DECL Value
         The value is undefined.
 
      */
-    MRDOCS_DECL Value() noexcept;
+    Value() noexcept;
 
     /** Constructor
 
         The function pushes a duplicate of
         value to the stack and associates
         the new value the top of the stack.
      */
-    MRDOCS_DECL Value(Value const&);
+    Value(Value const&);
 
     /** Constructor
 
         The function associates the
         existing value with this object.
      */
-    MRDOCS_DECL Value(Value&&) noexcept;
+    Value(Value&&) noexcept;
 
     /** Copy assignment.
 
         @copydetails Value(Value const&)
 
      */
-    MRDOCS_DECL Value& operator=(Value const&);
+    Value& operator=(Value const&);
 
     /** Move assignment.
 
         @copydetails Value(Value&&)
 
      */
-    MRDOCS_DECL Value& operator=(Value&&) noexcept;
+    Value& operator=(Value&&) noexcept;
 
     /** Return the type of the value.
 
@@ -476,7 +476,7 @@ class MRDOCS_DECL Value
         internal ECMAScript class `Function`.
 
      */
-    MRDOCS_DECL Type type() const noexcept;
+    Type type() const noexcept;
 
     /// Check if the value is undefined.
     bool
@@ -706,15 +706,13 @@ class MRDOCS_DECL Value
 
     /** Set or replace the value for a given key.
      */
-    MRDOCS_DECL
     void
     set(
         std::string_view key,
         Value const& value) const;
 
     /** Set or replace the value for a given key.
      */
-    MRDOCS_DECL
     void
     set(
         std::string_view key,
@@ -932,16 +930,13 @@ class MRDOCS_DECL Value
     toString(Value const& value);
 
 private:
-    MRDOCS_DECL
     Expected<Value>
     callImpl(
         std::initializer_list<dom::Value> args) const;
 
-    MRDOCS_DECL
     Expected<Value>
     callImpl(std::span<dom::Value> args) const;
 
-    MRDOCS_DECL
     Expected<Value>
     callPropImpl(
         std::string_view prop,
diff --git a/include/mrdocs/Support/ThreadPool.hpp b/include/mrdocs/Support/ThreadPool.hpp
@@ -149,8 +149,8 @@ class MRDOCS_VISIBLE
         @return Zero or more errors which were
         thrown from submitted work.
     */
-    MRDOCS_DECL
     [[nodiscard]]
+    MRDOCS_DECL
     std::vector<Error>
     wait();
 
diff --git a/src/lib/Dom/Array.cpp b/src/lib/Dom/Array.cpp
@@ -164,6 +164,23 @@ emplace_back(
 DefaultArrayImpl::
 DefaultArrayImpl() = default;
 
+DefaultArrayImpl::
+DefaultArrayImpl(const DefaultArrayImpl&) = default;
+
+DefaultArrayImpl::
+DefaultArrayImpl(DefaultArrayImpl&&) = default;
+
+DefaultArrayImpl&
+DefaultArrayImpl::
+operator=(const DefaultArrayImpl&) = default;
+
+DefaultArrayImpl&
+DefaultArrayImpl::
+operator=(DefaultArrayImpl&&) = default;
+
+DefaultArrayImpl::
+~DefaultArrayImpl() = default;
+
 DefaultArrayImpl::
 DefaultArrayImpl(
     storage_type elements) noexcept
diff --git a/src/lib/Dom/Object.cpp b/src/lib/Dom/Object.cpp
@@ -139,6 +139,23 @@ DefaultObjectImpl(
 {
 }
 
+DefaultObjectImpl::
+DefaultObjectImpl(const DefaultObjectImpl&) = default;
+
+DefaultObjectImpl::
+DefaultObjectImpl(DefaultObjectImpl&&) = default;
+
+DefaultObjectImpl&
+DefaultObjectImpl::
+operator=(const DefaultObjectImpl&) = default;
+
+DefaultObjectImpl&
+DefaultObjectImpl::
+operator=(DefaultObjectImpl&&) = default;
+
+DefaultObjectImpl::
+~DefaultObjectImpl() = default;
+
 std::size_t
 DefaultObjectImpl::
 size() const
diff --git a/src/lib/Lib/CMakeExecution.hpp b/src/lib/Lib/CMakeExecution.hpp
@@ -31,6 +31,7 @@ namespace mrdocs {
  * @return An `Expected` object containing the path to the generated `compile_commands.json` file if successful.
  *         Returns `Unexpected` if the project path is not found or if CMake execution fails.
  */
+MRDOCS_DECL
 Expected<std::string>
 executeCmakeExportCompileCommands(llvm::StringRef projectPath, llvm::StringRef cmakeArgs, llvm::StringRef tempDir);
 
diff --git a/src/lib/Lib/ConfigImpl.hpp b/src/lib/Lib/ConfigImpl.hpp
@@ -115,6 +115,7 @@ class ConfigImpl
 
         @param threadPool The thread pool to use.
     */
+    MRDOCS_DECL
     static
     Expected<std::shared_ptr<ConfigImpl const>>
     load(
diff --git a/src/lib/Lib/CorpusImpl.hpp b/src/lib/Lib/CorpusImpl.hpp
@@ -82,8 +82,8 @@ class CorpusImpl : public Corpus
         @param config A shared pointer to the configuration.
         @param compilations A compilations database for the input files.
     */
-    // MRDOCS_DECL
     [[nodiscard]]
+    MRDOCS_DECL
     static
     mrdocs::Expected<std::unique_ptr<Corpus>>
     build(
diff --git a/src/lib/Lib/MrDocsCompilationDatabase.hpp b/src/lib/Lib/MrDocsCompilationDatabase.hpp
@@ -33,7 +33,7 @@ namespace mrdocs {
     - Warnings are disabled
 
 */
-class MrDocsCompilationDatabase
+class MRDOCS_DECL MrDocsCompilationDatabase
     : public tooling::CompilationDatabase
 {
     std::vector<tooling::CompileCommand> AllCommands_;
diff --git a/src/lib/Metadata/Javadoc.cpp b/src/lib/Metadata/Javadoc.cpp
diff --git a/src/lib/Support/Path.hpp b/src/lib/Support/Path.hpp
