add export

Author: HeartLinked

cmake_modules/IcebergBuildUtils.cmake

@@ -138,6 +138,9 @@ function(add_iceberg_lib LIB_NAME)
       target_include_directories(${LIB_NAME}_shared PRIVATE ${ARG_PRIVATE_INCLUDES})
     endif()
 
+    target_include_directories(${LIB_NAME}_shared
+                               PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+
     set_target_properties(${LIB_NAME}_shared
                           PROPERTIES LINK_FLAGS "${ARG_SHARED_LINK_FLAGS}" OUTPUT_NAME
                                                                            ${LIB_NAME})
@@ -192,6 +195,9 @@ function(add_iceberg_lib LIB_NAME)
       set(LIB_NAME_STATIC ${LIB_NAME})
     endif()
 
+    target_include_directories(${LIB_NAME}_static
+                               PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+
     set_target_properties(${LIB_NAME}_static PROPERTIES OUTPUT_NAME ${LIB_NAME_STATIC})
 
     if(ARG_STATIC_INSTALL_INTERFACE_LIBS)

src/iceberg/catalog/rest/client.h

@@ -26,7 +26,7 @@
 
 #include <nlohmann/json.hpp>
 
-#include "iceberg/iceberg_export.h"
+#include "iceberg/catalog/rest/iceberg_rest_catalog_export.h"
 
 namespace iceberg::catalog::rest {
 
@@ -35,7 +35,7 @@ using HttpHeaders = std::map<std::string, std::string>;
 /**
  * @brief Base exception for REST client errors.
  */
-class ICEBERG_EXPORT RestException : public std::runtime_error {
+class ICEBERG_REST_CATALOG_EXPORT RestException : public std::runtime_error {
  public:
   explicit RestException(const std::string& message) : std::runtime_error(message) {}
 };
@@ -46,7 +46,7 @@ class ICEBERG_EXPORT RestException : public std::runtime_error {
  * This corresponds to the generic `E` type in the Rust implementation,
  * which is deserialized from the error response body.
  */
-class ICEBERG_EXPORT ServerErrorException : public RestException {
+class ICEBERG_REST_CATALOG_EXPORT ServerErrorException : public RestException {
  public:
   ServerErrorException(int status_code, std::string response_body,
                        nlohmann::json error_payload)
@@ -70,7 +70,7 @@ class ICEBERG_EXPORT ServerErrorException : public RestException {
  *
  * This corresponds to the `Error::new(ErrorKind::Unexpected, ...)` part in Rust.
  */
-class ICEBERG_EXPORT ResponseParseException : public RestException {
+class ICEBERG_REST_CATALOG_EXPORT ResponseParseException : public RestException {
  public:
   ResponseParseException(std::string message, std::string response_body)
       : RestException(std::move(message)), response_body_(std::move(response_body)) {}
@@ -81,7 +81,7 @@ class ICEBERG_EXPORT ResponseParseException : public RestException {
   std::string response_body_;
 };
 
-class ICEBERG_EXPORT HttpClient {
+class ICEBERG_REST_CATALOG_EXPORT HttpClient {
  public:
   HttpClient(const std::string& base_uri, const HttpHeaders& common_headers);
   ~HttpClient();

src/iceberg/catalog/rest/rest_catalog.h

@@ -21,11 +21,11 @@
 
 #include <cpr/cpr.h>
 
-#include "iceberg/iceberg_export.h"
+#include "iceberg/catalog/rest/iceberg_rest_catalog_export.h"
 
 namespace iceberg::catalog::rest {
 
-class ICEBERG_EXPORT RestCatalog {
+class ICEBERG_REST_CATALOG_EXPORT RestCatalog {
  public:
   explicit RestCatalog(const std::string& base_url);
   ~RestCatalog() = default;

test/CMakeLists.txt

@@ -146,11 +146,4 @@ if(ICEBERG_BUILD_REST_CATALOG)
   add_iceberg_test(rest_catalog_test SOURCES rest_catalog_test.cc)
   target_link_libraries(rest_catalog_test PRIVATE iceberg_rest_catalog_static)
   target_include_directories(rest_catalog_test PRIVATE ${cpp-httplib_SOURCE_DIR})
-
-  if(WIN32)
-    target_link_libraries(rest_catalog_test PRIVATE ws2_32 crypt32)
-  else()
-    target_link_libraries(rest_catalog_test PRIVATE Threads::Threads)
-  endif()
-
 endif()