Creating per-library EXPORT symbols (#44)

* Creating per-library EXPORT symbols Signed-off-by: Andrew V. Jones <[email protected]> * Removing out of date comment Signed-off-by: Andrew V. Jones <[email protected]>
ltcmelo · Sep 24, 2021 · 85f39b1 · 85f39b1
1 parent b2f7606
commit 85f39b1
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 12 deletions.
diff --git a/C/API.h b/C/API.h
@@ -23,7 +23,7 @@
 
 // From https://gcc.gnu.org/wiki/Visibility
 #if defined _WIN32 || defined __CYGWIN__
-  #ifdef EXPORT_API
+  #ifdef EXPORT_C_API
     #ifdef __GNUC__
       #define PSY_C_API __attribute__ ((dllexport))
     #else

diff --git a/C/CMakeLists.txt b/C/CMakeLists.txt
@@ -15,8 +15,19 @@ set(CFE_CXX_FLAGS "${CFE_CXX_FLAGS} -g")
 set(CFE_CXX_FLAGS "${CFE_CXX_FLAGS} -Wall \
                                     -Wsign-compare")
 
+set(CFE_CXX_FLAGS "${CFE_CXX_FLAGS} -DEXPORT_C_API")
+set(PLUGIN_CXX_FLAGS "${CFE_CXX_FLAGS} -DEXPORT_PLUGIN_API")
+
 set(CMAKE_MACOSX_RPATH TRUE)
 
+set(PLUGIN_SOURCES
+    # Plugin API files
+    ${PROJECT_SOURCE_DIR}/plugin-api/PluginConfig.h
+    ${PROJECT_SOURCE_DIR}/plugin-api/DeclarationInterceptor.h
+    ${PROJECT_SOURCE_DIR}/plugin-api/SourceInspector.h
+    ${PROJECT_SOURCE_DIR}/plugin-api/VisitorObserver.h
+)
+
 set(CFE_SOURCES
     # Main
     ${PROJECT_SOURCE_DIR}/API.h
@@ -103,12 +114,6 @@ set(CFE_SOURCES
     ${PROJECT_SOURCE_DIR}/names/DeclarationName.h
     ${PROJECT_SOURCE_DIR}/names/DeclarationNames.cpp
     ${PROJECT_SOURCE_DIR}/names/DeclarationNames.h
-
-    # Plugin API files
-    ${PROJECT_SOURCE_DIR}/plugin-api/PluginConfig.h
-    ${PROJECT_SOURCE_DIR}/plugin-api/DeclarationInterceptor.h
-    ${PROJECT_SOURCE_DIR}/plugin-api/SourceInspector.h
-    ${PROJECT_SOURCE_DIR}/plugin-api/VisitorObserver.h
 
     # Tests
     ${PROJECT_SOURCE_DIR}/tests/TestBinder.h
@@ -125,6 +130,13 @@ set(CFE_SOURCES
     ${PROJECT_SOURCE_DIR}/tests/TestTypeChecker.cpp
 )
 
+foreach(file ${PLUGIN_SOURCES})
+    set_source_files_properties(
+        ${file} PROPERTIES
+        COMPILE_FLAGS "${PLUGIN_CXX_FLAGS}"
+    )
+endforeach()
+
 foreach(file ${CFE_SOURCES})
     set_source_files_properties(
         ${file} PROPERTIES
@@ -138,7 +150,7 @@ include_directories(
 )
 
 set(LIBRARY psychecfe)
-add_library(${LIBRARY} SHARED ${CFE_SOURCES})
+add_library(${LIBRARY} SHARED ${CFE_SOURCES} ${PLUGIN_SOURCES})
 
 target_link_libraries(${LIBRARY} psychecommon)
 

diff --git a/C/plugin-api/PluginConfig.h b/C/plugin-api/PluginConfig.h
@@ -23,7 +23,7 @@
 
 // From https://gcc.gnu.org/wiki/Visibility
 #if defined _WIN32 || defined __CYGWIN__
-  #ifdef EXPORT_API
+  #ifdef EXPORT_PLUGIN_API
     #ifdef __GNUC__
       #define PLUGIN_API __attribute__ ((dllexport))
     #else

diff --git a/C/stdlib-support/CMakeLists.txt b/C/stdlib-support/CMakeLists.txt
@@ -12,6 +12,8 @@ set(STD_CXX_FLAGS "${STD_CXX_FLAGS} -g")
 set(STD_CXX_FLAGS "${STD_CXX_FLAGS} -Wall \
                                     -Wsign-compare")
 
+set(STD_CXX_FLAGS "${STD_CXX_FLAGS} -DEXPORT_C_API -DEXPORT_PLUGIN_API")
+
 set(CMAKE_MACOSX_RPATH TRUE)
 set(CMAKE_INSTALL_RPATH "\$ORIGIN;@executable_path;@loader_path")
 

diff --git a/common/API.h b/common/API.h
@@ -23,7 +23,7 @@
 
 // From https://gcc.gnu.org/wiki/Visibility
 #if defined _WIN32 || defined __CYGWIN__
-  #ifdef EXPORT_API
+  #ifdef EXPORT_PSY_API
     #ifdef __GNUC__
       #define PSY_API __attribute__ ((dllexport))
     #else

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -11,6 +11,8 @@ set(COMMON_CXX_FLAGS)
 set(COMMON_CXX_FLAGS "${CFE_CXX_FLAGS} -g")
 set(COMMON_CXX_FLAGS "${CFE_CXX_FLAGS} -Wall \
                                        -Wsign-compare")
+set(COMMON_CXX_FLAGS "${CFE_CXX_FLAGS} -DEXPORT_PSY_API")
+
 
 set(CMAKE_MACOSX_RPATH TRUE)
 

diff --git a/common/diagnostics/Diagnostic.h b/common/diagnostics/Diagnostic.h
@@ -80,7 +80,7 @@ class PSY_API Diagnostic
     friend class C::TestFrontend;
 };
 
-std::ostream& operator<<(std::ostream& os, const Diagnostic& diagnostic);
+PSY_API std::ostream& operator<<(std::ostream& os, const Diagnostic& diagnostic);
 
 } // psy
 

diff --git a/common/location/LinePosition.h b/common/location/LinePosition.h
@@ -58,7 +58,7 @@ bool operator==(const LinePosition& a, const LinePosition& b);
 
 bool operator<(const LinePosition& a, const LinePosition& b);
 
-std::ostream& operator<<(std::ostream& os, const LinePosition& pos);
+PSY_API std::ostream& operator<<(std::ostream& os, const LinePosition& pos);
 
 } // psy