do not use cmake export all flag for windows

DerThorsten · web-flow · commit ced29abc4d4f · 2023-08-09T11:33:07.000+02:00
* do not use cmake export all flag for windows and try to export used symbols by hand
* run examples in ci for windows
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -53,26 +53,13 @@ jobs:
         shell: bash -l {0}
         run: |
             cd bld
-            ctest -V
+            ctest -V -R test
 
-      - name: Run examples
+      - name: Run C++ examples
         shell: bash -l {0}
         run: |
-            cd bld/examples/
-
-            pushd accumulator
-            ./main_accumulator .
-            popd
-
-            pushd serialize
-            ./main_serialize .
-            popd
-
-            pushd custom_factory_with_metadata
-            ./main_custom_factory_with_metadata .
-            popd
-
-
+            cd bld
+            ctest -V -R example
 
       - name: Install
         shell: bash -l {0}
@@ -123,7 +110,7 @@ jobs:
            -G Ninja ^
            -DCMAKE_BUILD_TYPE=Release ^
            -DXPLUGIN_BUILD_TESTS=ON ^
-           -DXPLUGIN_BUILD_EXAMPLES=OFF ^
+           -DXPLUGIN_BUILD_EXAMPLES=ON ^
            -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" ^
            -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%
           cmake --build . --config Release
@@ -132,7 +119,13 @@ jobs:
         shell: cmd /C CALL {0}
         run: |
           cd bld
-          ctest -V --config Release
+          ctest -V --config Release -R test
+
+      - name: Run C++ examples
+        shell: cmd /C CALL {0}
+        run: |
+          cd bld
+          ctest -V --config Release -R example
 
       - name: Install
         shell: cmd /C CALL {0}
diff --git a/cmake/xplugin_add_xplugin.cmake b/cmake/xplugin_add_xplugin.cmake
@@ -5,9 +5,8 @@ function(add_xplugin target_name)
 
     if (WIN32)
         # add compile definitions
-        target_compile_definitions(${target_name} PUBLIC  XPLUGIN_EXPORTS)
+        target_compile_definitions(${target_name} PRIVATE  XPLUGIN_EXPORTS)
 
-        set_property(TARGET ${target_name} PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS true)
     endif()
 
     set_target_properties(${target_name} PROPERTIES
diff --git a/examples/accumulator/CMakeLists.txt b/examples/accumulator/CMakeLists.txt
@@ -15,3 +15,9 @@ target_compile_features(main_accumulator PRIVATE cxx_std_17)
 set_target_properties(main_accumulator PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 xplugin_add_emscripten_main_module_flags(main_accumulator)
+
+
+# if tests are enabled, add a the example to the tests
+if (XPLUGIN_BUILD_TESTS)
+    add_test(NAME example_accumulator COMMAND main_accumulator ${CMAKE_CURRENT_BINARY_DIR})
+endif()
diff --git a/examples/accumulator/accumulator_base.hpp b/examples/accumulator/accumulator_base.hpp
@@ -4,9 +4,11 @@
 #include <string>
 #include <vector>
 
+#include <xplugin/xplugin_config.hpp> // XPLUGIN_API
+
 namespace acc
 {
-class AccumulatorBase
+class XPLUGIN_API AccumulatorBase
 {
   public:
     virtual ~AccumulatorBase()
diff --git a/examples/accumulator/plugin_accumulator_min.cpp b/examples/accumulator/plugin_accumulator_min.cpp
@@ -3,7 +3,7 @@
 
 #include <algorithm>
 
-class AccumulatorMin : public acc::AccumulatorBase
+class XPLUGIN_API AccumulatorMin : public acc::AccumulatorBase
 {
   public:
     AccumulatorMin() = default;
diff --git a/examples/custom_factory_with_metadata/CMakeLists.txt b/examples/custom_factory_with_metadata/CMakeLists.txt
@@ -11,3 +11,8 @@ target_link_libraries(main_custom_factory_with_metadata PUBLIC xplugin_host)
 set_target_properties(main_custom_factory_with_metadata PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 xplugin_add_emscripten_main_module_flags(main_custom_factory_with_metadata)
+
+# if tests are enabled, add a the example to the tests
+if (XPLUGIN_BUILD_TESTS)
+    add_test(NAME example_custom_factory_with_metadata COMMAND main_custom_factory_with_metadata ${CMAKE_CURRENT_BINARY_DIR})
+endif()
diff --git a/examples/custom_factory_with_metadata/custom_factory_with_metadata_plugin_a.cpp b/examples/custom_factory_with_metadata/custom_factory_with_metadata_plugin_a.cpp
@@ -3,7 +3,7 @@
 // for XPLUGIN_CREATE_XPLUGIN_FACTORY macro
 #include <xplugin/xfactory.hpp>
 
-class PluginA : public PluginBase
+class XPLUGIN_API PluginA : public PluginBase
 {
   public:
     PluginA() = default;
@@ -19,7 +19,7 @@ class PluginA : public PluginBase
     std::string m_b;
 };
 
-class PluginAFactory : public PluginFactoryBase
+class XPLUGIN_API PluginAFactory : public PluginFactoryBase
 {
   public:
     using factory_base_type = PluginFactoryBase;
diff --git a/examples/custom_factory_with_metadata/custom_factory_with_metadata_plugin_b.cpp b/examples/custom_factory_with_metadata/custom_factory_with_metadata_plugin_b.cpp
@@ -3,7 +3,7 @@
 // for XPLUGIN_CREATE_XPLUGIN_FACTORY macro
 #include <xplugin/xfactory.hpp>
 
-class PluginB : public PluginBase
+class XPLUGIN_API PluginB : public PluginBase
 {
   public:
     PluginB() = default;
@@ -19,7 +19,7 @@ class PluginB : public PluginBase
     std::string m_b;
 };
 
-class PluginBFactory : public PluginFactoryBase
+class XPLUGIN_API PluginBFactory : public PluginFactoryBase
 {
   public:
     using factory_base_type = PluginFactoryBase;
diff --git a/examples/custom_factory_with_metadata/custom_factory_with_metadata_plugin_base.hpp b/examples/custom_factory_with_metadata/custom_factory_with_metadata_plugin_base.hpp
@@ -4,7 +4,9 @@
 #include <memory>
 #include <string>
 
-class PluginBase
+#include <xplugin/xplugin_config.hpp>
+
+class XPLUGIN_API PluginBase
 {
   public:
     virtual ~PluginBase()
@@ -14,7 +16,7 @@ class PluginBase
     virtual std::string some_function() const = 0;
 };
 
-class PluginFactoryBase
+class XPLUGIN_API PluginFactoryBase
 {
   public:
     virtual ~PluginFactoryBase() = default;
diff --git a/examples/fubar/CMakeLists.txt b/examples/fubar/CMakeLists.txt
@@ -11,3 +11,8 @@ target_link_libraries(main_fubar PUBLIC xplugin_host)
 set_target_properties(main_fubar PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 xplugin_add_emscripten_main_module_flags(main_fubar)
+
+# if tests are enabled, add a the example to the tests
+if (XPLUGIN_BUILD_TESTS)
+    add_test(NAME example_fubar COMMAND main_fubar ${CMAKE_CURRENT_BINARY_DIR})
+endif()
diff --git a/examples/fubar/fubar_base.hpp b/examples/fubar/fubar_base.hpp
@@ -4,9 +4,11 @@
 #include <string>
 #include <vector>
 
+#include <xplugin/xplugin_config.hpp>
+
 namespace fubar
 {
-class FubarBase
+class XPLUGIN_API FubarBase
 {
   public:
     virtual ~FubarBase()
diff --git a/examples/fubar/plugin_bar.cpp b/examples/fubar/plugin_bar.cpp
@@ -1,7 +1,7 @@
 #include <fubar_base.hpp>
 #include <xplugin/xfactory.hpp>
 
-class Bar : public fubar::FubarBase
+class XPLUGIN_API Bar : public fubar::FubarBase
 {
   public:
     Bar(const std::string name)
@@ -19,5 +19,7 @@ class Bar : public fubar::FubarBase
     std::string name_;
 };
 
+template class XPLUGIN_API xp::xfactory<Bar, fubar::FubarBase, const std::string &>;
+
 using factory_type = xp::xfactory<Bar, fubar::FubarBase, const std::string &>;
 XPLUGIN_CREATE_XPLUGIN_FACTORY(factory_type);
diff --git a/examples/fubar/plugin_foo.cpp b/examples/fubar/plugin_foo.cpp
@@ -20,5 +20,7 @@ class Foo : public fubar::FubarBase
     std::string name_;
 };
 
+template class XPLUGIN_API xp::xfactory<Foo, fubar::FubarBase, const std::string &>;
+
 using factory_type = xp::xfactory<Foo, fubar::FubarBase, const std::string &>;
 XPLUGIN_CREATE_XPLUGIN_FACTORY(factory_type);
diff --git a/examples/serialize/serialize_base.hpp b/examples/serialize/serialize_base.hpp
@@ -4,7 +4,9 @@
 #include <string>
 #include <unordered_map>
 
-class SerializeBase
+#include <xplugin/xplugin_config.hpp>
+
+class XPLUGIN_API SerializeBase
 {
   public:
     virtual ~SerializeBase() = default;
diff --git a/examples/serialize/serialize_json.cpp b/examples/serialize/serialize_json.cpp
@@ -36,5 +36,7 @@ class SerializeJson : public SerializeBase
     }
 };
 
+template class XPLUGIN_API xp::xfactory<SerializeJson, SerializeBase>;
+
 using factory_type = xp::xfactory<SerializeJson, SerializeBase>;
 XPLUGIN_CREATE_XPLUGIN_FACTORY(factory_type);
diff --git a/examples/serialize/serialize_simple.cpp b/examples/serialize/serialize_simple.cpp
@@ -2,7 +2,7 @@
 #include <sstream>
 #include <xplugin/xfactory.hpp>
 
-class SerializeSimple : public SerializeBase
+class XPLUGIN_API SerializeSimple : public SerializeBase
 {
   public:
     virtual ~SerializeSimple() = default;
@@ -36,5 +36,7 @@ class SerializeSimple : public SerializeBase
     }
 };
 
+template class XPLUGIN_API xp::xfactory<SerializeSimple, SerializeBase>;
+
 using factory_type = xp::xfactory<SerializeSimple, SerializeBase>;
 XPLUGIN_CREATE_XPLUGIN_FACTORY(factory_type);
diff --git a/include/xplugin/xfactory.hpp b/include/xplugin/xfactory.hpp
@@ -14,7 +14,7 @@
 #include <memory>
 
 #define XPLUGIN_CREATE_XPLUGIN_FACTORY(FACTORY_TYPE)                                                                   \
-    extern "C" XPLUGIN_EXPORT typename FACTORY_TYPE::factory_base_type *create_plugin_factory()                        \
+    extern "C" XPLUGIN_API typename FACTORY_TYPE::factory_base_type *create_plugin_factory()                           \
     {                                                                                                                  \
         return new FACTORY_TYPE();                                                                                     \
     }
diff --git a/include/xplugin/xplugin_config.hpp b/include/xplugin/xplugin_config.hpp
@@ -15,10 +15,9 @@
 #else
 #define XPLUGIN_API __declspec(dllimport)
 #endif
-#define XPLUGIN_EXPORT __declspec(dllexport)
+
 #else
 #define XPLUGIN_API
-#define XPLUGIN_EXPORT
 #endif
 
 #define XPLUGIN_VERSION_MAJOR 0
diff --git a/test/testplugin_a/plugin_01.cpp b/test/testplugin_a/plugin_01.cpp
@@ -4,7 +4,7 @@
 // the base factory for the plugin
 #include <xplugin/xfactory.hpp>
 
-class Plugin01 : public plugin::PluginBase
+class XPLUGIN_API Plugin01 : public plugin::PluginBase
 {
   public:
     Plugin01(int a, std::string b)
@@ -22,5 +22,7 @@ class Plugin01 : public plugin::PluginBase
     std::string m_b;
 };
 
+template class XPLUGIN_API xp::xfactory<Plugin01, plugin::PluginBase, int, std::string>;
+
 using factory_type = xp::xfactory<Plugin01, plugin::PluginBase, int, std::string>;
 XPLUGIN_CREATE_XPLUGIN_FACTORY(factory_type);
diff --git a/test/testplugin_a/plugin_02.cpp b/test/testplugin_a/plugin_02.cpp
@@ -4,7 +4,7 @@
 // the base factory for the plugin
 #include <xplugin/xfactory.hpp>
 
-class Plugin02 : public plugin::PluginBase
+class XPLUGIN_API Plugin02 : public plugin::PluginBase
 {
   public:
     Plugin02(int a, std::string b)
@@ -22,5 +22,7 @@ class Plugin02 : public plugin::PluginBase
     std::string m_b;
 };
 
+template class XPLUGIN_API xp::xfactory<Plugin02, plugin::PluginBase, int, std::string>;
+
 using factory_type = xp::xfactory<Plugin02, plugin::PluginBase, int, std::string>;
 XPLUGIN_CREATE_XPLUGIN_FACTORY(factory_type);
diff --git a/test/testplugin_a/plugin_03.cpp b/test/testplugin_a/plugin_03.cpp
@@ -4,7 +4,7 @@
 // the base factory for the plugin
 #include <xplugin/xfactory.hpp>
 
-class Plugin03 : public plugin::PluginBase
+class XPLUGIN_API Plugin03 : public plugin::PluginBase
 {
   public:
     Plugin03(int a, std::string b)
@@ -22,5 +22,7 @@ class Plugin03 : public plugin::PluginBase
     std::string m_b;
 };
 
+template class XPLUGIN_API xp::xfactory<Plugin03, plugin::PluginBase, int, std::string>;
+
 using factory_type = xp::xfactory<Plugin03, plugin::PluginBase, int, std::string>;
 XPLUGIN_CREATE_XPLUGIN_FACTORY(factory_type);
diff --git a/test/testplugin_a/plugin_base.hpp b/test/testplugin_a/plugin_base.hpp
@@ -6,7 +6,7 @@
 #include <string>
 namespace plugin
 {
-class PluginBase
+class XPLUGIN_API PluginBase
 {
   public:
     virtual ~PluginBase() = default;
@@ -17,9 +17,6 @@ class PluginBase
     };
 };
 
-// all plugin instances expect to be constructed with the same arguments
-// in this case, an int and a string.
-using PluginFactoryBase = xp::xfactory_base<PluginBase, int, std::string>;
 }; // namespace plugin
 
 #endif // PLUGIN_BASE_HPP

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@`
`4`	`4`	`#include <string>`
`5`	`5`	`#include <vector>`
`6`	`6`
	`7`	`+#include <xplugin/xplugin_config.hpp> // XPLUGIN_API`
	`8`	`+`
`7`	`9`	`namespace acc`
`8`	`10`	`{`
`9`		`-class AccumulatorBase`
	`11`	`+class XPLUGIN_API AccumulatorBase`
`10`	`12`	`{`
`11`	`13`	`public:`
`12`	`14`	`virtual ~AccumulatorBase()`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <algorithm>`
`5`	`5`
`6`		`-class AccumulatorMin : public acc::AccumulatorBase`
	`6`	`+class XPLUGIN_API AccumulatorMin : public acc::AccumulatorBase`
`7`	`7`	`{`
`8`	`8`	`public:`
`9`	`9`	`AccumulatorMin() = default;`