move iceberg_core location

Author: wgtmac

cmake_modules/BuildUtils.cmake

@@ -39,7 +39,7 @@ function(iceberg_install_cmake_package PACKAGE_NAME EXPORT_NAME)
           FILE "${TARGETS_CMAKE}")
 endfunction()
 
-function(ADD_ICEBERG_LIB LIB_NAME)
+function(add_iceberg_lib LIB_NAME)
   set(options)
   set(one_value_args
       BUILD_SHARED
@@ -218,3 +218,13 @@ function(ADD_ICEBERG_LIB LIB_NAME)
         PARENT_SCOPE)
   endif()
 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()

src/CMakeLists.txt

@@ -15,8 +15,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_subdirectory(core)
-add_subdirectory(puffin)
+set(ICEBERG_CORE_SOURCES core/demo_table.cc)
+set(ICEBERG_CORE_INCLUDES "${ICEBERG_API_DIR}")
+
+add_iceberg_lib(iceberg_core
+                SOURCES
+                ${ICEBERG_CORE_SOURCES}
+                OUTPUTS
+                ICEBERG_CORE_LIBRARIES
+                PRIVATE_INCLUDES
+                ${ICEBERG_CORE_INCLUDES})
+
+iceberg_set_export_definitions(iceberg_core_static "${ICEBERG_CORE_LIBRARIES}")
+
 add_subdirectory(arrow)
+add_subdirectory(puffin)
 
 iceberg_install_cmake_package(Iceberg iceberg_targets)

src/arrow/CMakeLists.txt

@@ -72,13 +72,7 @@ add_iceberg_lib(iceberg_arrow
                 SHARED_INSTALL_INTERFACE_LIBS
                 ${ICEBERG_ARROW_SHARED_INSTALL_INTERFACE_LIBS})
 
-if(ICEBERG_BUILD_STATIC AND WIN32)
-  target_compile_definitions(iceberg_arrow_static PUBLIC ICEBERG_STATIC)
-endif()
-
-foreach(LIB_TARGET ${ICEBERG_ARROW_LIBRARIES})
-  target_compile_definitions(${LIB_TARGET} PRIVATE ICEBERG_EXPORTING)
-endforeach()
+iceberg_set_export_definitions(iceberg_arrow_static "${ICEBERG_ARROW_LIBRARIES}")
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/demo_arrow.h"
         DESTINATION "${ICEBERG_INSTALL_INCLUDEDIR}/iceberg/arrow")

src/core/CMakeLists.txt

@@ -26,10 +26,4 @@ add_iceberg_lib(iceberg_puffin
                 PRIVATE_INCLUDES
                 ${ICEBERG_PUFFIN_INCLUDES})
 
-if(ICEBERG_BUILD_STATIC AND WIN32)
-  target_compile_definitions(iceberg_puffin_static PUBLIC ICEBERG_STATIC)
-endif()
-
-foreach(LIB_TARGET ${ICEBERG_PUFFIN_LIBRARIES})
-  target_compile_definitions(${LIB_TARGET} PRIVATE ICEBERG_EXPORTING)
-endforeach()
+iceberg_set_export_definitions(iceberg_puffin_static "${ICEBERG_PUFFIN_LIBRARIES}")