MARKUP_PARSER kicommon

common/CMakeLists.txt

@@ -49,6 +49,7 @@ set( KICOMMON_SRCS
     exceptions.cpp
     lib_id.cpp
     locale_io.cpp
+    markup_parser.cpp
     richio.cpp
     string_utils.cpp
     wx_filename.cpp
@@ -102,8 +103,11 @@ target_include_directories( kicommon
     PUBLIC
         .
         ${CMAKE_BINARY_DIR}
+        $<TARGET_PROPERTY:pegtl,INTERFACE_INCLUDE_DIRECTORIES>
     )
 
+add_dependencies( kicommon pegtl )
+
 # The build version string defaults to the value in the KiCadVersion.cmake file.
 # If being built inside a git repository, the git tag and commit hash are used to create
 # a new version string instead. The user can supply an additional string to be appended
@@ -413,7 +417,6 @@ set( COMMON_SRCS
     lib_tree_model_adapter.cpp
     lset.cpp
     marker_base.cpp
-    markup_parser.cpp
     netclass.cpp
     notifications_manager.cpp
     origin_transforms.cpp

include/markup_parser.h

@@ -26,6 +26,7 @@
 #include <iostream>
 #include <string>
 #include <core/utf8.h>
+#include <kicommon.h>
 
 
 namespace MARKUP
@@ -36,7 +37,7 @@ struct subscript;
 struct superscript;
 struct overbar;
 
-struct NODE : parse_tree::basic_node<NODE>
+struct KICOMMON_API NODE : parse_tree::basic_node<NODE>
 {
     std::string asString() const;
 
@@ -99,7 +100,7 @@ using selector = parse_tree::selector< Rule,
                                                                       subscript,
                                                                       overbar > >;
 
-class MARKUP_PARSER
+class KICOMMON_API MARKUP_PARSER
 {
 public:
     MARKUP_PARSER( const std::string& source ) :