use generate_export_header

apache · Jan 2, 2025 · 0d337bd · 0d337bd
1 parent 64c8e29
commit 0d337bd
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 59 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,6 +54,7 @@ endif()
 include(CMakeParseArguments)
 include(BuildUtils)
 include(ThirdpartyToolchain)
+include(GenerateExportHeader)
 
 add_subdirectory(src)
 

diff --git a/cmake_modules/BuildUtils.cmake b/cmake_modules/BuildUtils.cmake
@@ -211,6 +211,18 @@ function(add_iceberg_lib LIB_NAME)
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   endif()
 
+  # generate export header file
+  string(TOUPPER ${LIB_NAME} LIB_NAME_UPPER)
+  if(BUILD_SHARED)
+    generate_export_header(${LIB_NAME}_shared BASE_NAME ${LIB_NAME_UPPER})
+    if(BUILD_STATIC)
+      set_target_properties(${LIB_NAME}_static
+                            PROPERTIES COMPILE_FLAGS "-D${LIB_NAME_UPPER}_STATIC_DEFINE")
+    endif()
+  elseif(BUILD_STATIC)
+    generate_export_header(${LIB_NAME}_static BASE_NAME ${LIB_NAME_UPPER})
+  endif()
+
   # Modify variable in calling scope
   if(ARG_OUTPUTS)
     set(${ARG_OUTPUTS}
@@ -243,13 +255,3 @@ function(iceberg_install_all_headers PATH)
   endforeach()
   install(FILES ${PUBLIC_HEADERS} DESTINATION "${ICEBERG_INSTALL_INCLUDEDIR}/${PATH}")
 endfunction()
-
-function(iceberg_set_export_definitions STATIC_TARGET LIB_TARGETS)
-  if(ICEBERG_BUILD_STATIC AND WIN32)
-    target_compile_definitions(${STATIC_TARGET} PUBLIC ICEBERG_STATIC)
-  endif()
-
-  foreach(LIB_TARGET ${LIB_TARGETS})
-    target_compile_definitions(${LIB_TARGET} PRIVATE ICEBERG_EXPORTING)
-  endforeach()
-endfunction()
diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt
@@ -16,19 +16,19 @@
 # under the License.
 
 set(ICEBERG_SOURCES demo_table.cc)
-set(ICEBERG_INCLUDES "${CMAKE_SOURCE_DIR}/src")
+set(ICEBERG_INCLUDES "${CMAKE_SOURCE_DIR}/src" "${CMAKE_BINARY_DIR}/src")
 
 add_iceberg_lib(iceberg
                 SOURCES
                 ${ICEBERG_SOURCES}
-                OUTPUTS
-                ICEBERG_LIBRARIES
                 PRIVATE_INCLUDES
                 ${ICEBERG_INCLUDES})
 
-iceberg_set_export_definitions(iceberg_static "${ICEBERG_LIBRARIES}")
 iceberg_install_all_headers(iceberg)
 
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_export.h
+        DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg)
+
 add_subdirectory(arrow)
 add_subdirectory(puffin)
 

diff --git a/src/iceberg/arrow/CMakeLists.txt b/src/iceberg/arrow/CMakeLists.txt
@@ -61,8 +61,6 @@ list(APPEND
 add_iceberg_lib(iceberg_arrow
                 SOURCES
                 ${ICEBERG_ARROW_SOURCES}
-                OUTPUTS
-                ICEBERG_ARROW_LIBRARIES
                 PRIVATE_INCLUDES
                 ${ICEBERG_ARROW_INCLUDES}
                 SHARED_LINK_LIBS
@@ -74,5 +72,8 @@ add_iceberg_lib(iceberg_arrow
                 SHARED_INSTALL_INTERFACE_LIBS
                 ${ICEBERG_ARROW_SHARED_INSTALL_INTERFACE_LIBS})
 
-iceberg_set_export_definitions(iceberg_arrow_static "${ICEBERG_ARROW_LIBRARIES}")
+
 iceberg_install_all_headers(iceberg/arrow)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_arrow_export.h
+        DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg/arrow)
diff --git a/src/iceberg/arrow/demo_arrow.h b/src/iceberg/arrow/demo_arrow.h
@@ -21,12 +21,12 @@
 
 #include <string>
 
+#include "iceberg/arrow/iceberg_arrow_export.h"
 #include "iceberg/table.h"
-#include "iceberg/visibility.h"
 
 namespace iceberg::arrow {
 
-class ICEBERG_EXPORT DemoArrow : public Table {
+class ICEBERG_ARROW_EXPORT DemoArrow : public Table {
  public:
   DemoArrow() = default;
   ~DemoArrow() override = default;

diff --git a/src/iceberg/puffin.h b/src/iceberg/puffin.h
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "iceberg/visibility.h"
+#include "iceberg/iceberg_export.h"
 
 namespace iceberg {
 

diff --git a/src/iceberg/puffin/CMakeLists.txt b/src/iceberg/puffin/CMakeLists.txt
@@ -39,8 +39,6 @@ list(APPEND
 add_iceberg_lib(iceberg_puffin
                 SOURCES
                 ${ICEBERG_PUFFIN_SOURCES}
-                OUTPUTS
-                ICEBERG_PUFFIN_LIBRARIES
                 PRIVATE_INCLUDES
                 ${ICEBERG_PUFFIN_INCLUDES}
                 SHARED_LINK_LIBS
@@ -52,5 +50,7 @@ add_iceberg_lib(iceberg_puffin
                 SHARED_INSTALL_INTERFACE_LIBS
                 ${ICEBERG_PUFFIN_SHARED_INSTALL_INTERFACE_LIBS})
 
-iceberg_set_export_definitions(iceberg_puffin_static "${ICEBERG_PUFFIN_LIBRARIES}")
 iceberg_install_all_headers(iceberg/puffin)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_puffin_export.h
+        DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg/puffin)
diff --git a/src/iceberg/puffin/demo_puffin.h b/src/iceberg/puffin/demo_puffin.h
@@ -20,10 +20,11 @@
 #pragma once
 
 #include "iceberg/puffin.h"
+#include "iceberg/puffin/iceberg_puffin_export.h"
 
 namespace iceberg::puffin {
 
-class ICEBERG_EXPORT DemoPuffin : public Puffin {
+class ICEBERG_PUFFIN_EXPORT DemoPuffin : public Puffin {
  public:
   DemoPuffin() = default;
   ~DemoPuffin() override = default;

diff --git a/src/iceberg/table.h b/src/iceberg/table.h
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "iceberg/visibility.h"
+#include "iceberg/iceberg_export.h"
 
 namespace iceberg {
 

diff --git a/src/iceberg/visibility.h b/src/iceberg/visibility.h