Explorar o código

Merge pull request #11091 from rpastrana/HPCC-19154-ESDLTemplate

HPCC-19568 Declare ESPcfg class as export

Reviewed-By: Russ Whitehead <william.whitehead@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=7) %!d(string=hai) anos
pai
achega
b3a02ff62d
Modificáronse 2 ficheiros con 8 adicións e 2 borrados
  1. 1 1
      esp/platform/CMakeLists.txt
  2. 7 1
      esp/platform/espcfg.ipp

+ 1 - 1
esp/platform/CMakeLists.txt

@@ -46,7 +46,7 @@ include_directories (
          ${CMAKE_BINARY_DIR}/oss
     )
 
-ADD_DEFINITIONS( -D_CONSOLE )
+ADD_DEFINITIONS( -D_CONSOLE -DESPCFG_EXPORTS)
 
 HPCC_ADD_EXECUTABLE ( esp ${SRCS} )
 install ( TARGETS esp RUNTIME DESTINATION ${EXEC_DIR} )

+ 7 - 1
esp/platform/espcfg.ipp

@@ -128,7 +128,13 @@ public:
 
 static CriticalSection attachcrit;
 
-class CEspConfig : public CInterface, implements IInterface 
+#ifdef ESPCFG_EXPORTS
+    #define esp_cfg_decl DECL_EXPORT
+#else
+    #define esp_cfg_decl DECL_IMPORT
+#endif
+
+class esp_cfg_decl CEspConfig : public CInterface, implements IInterface
 {
 private:
     Owned<IPropertyTree> m_envpt;