Skip to content

Commit a35dcec

Browse files
authored
Merge pull request #5 from Hugoberry/posix-build
Dummy build for POSIX
2 parents eb6973b + e721fd9 commit a35dcec

File tree

9 files changed

+115
-571
lines changed

9 files changed

+115
-571
lines changed

.github/workflows/ExtensionTemplate.yml

Lines changed: 0 additions & 162 deletions
This file was deleted.

.github/workflows/MainDistributionPipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
duckdb_version: main
2020
ci_tools_version: main
2121
extension_name: msolap
22-
exclude_archs: 'linux_amd64;linux_amd64_gcc4;linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
22+
exclude_archs: 'linux_amd64;linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
2323
skip_tests: true
2424

2525
duckdb-stable-build:
@@ -29,6 +29,6 @@ jobs:
2929
duckdb_version: v1.2.2
3030
ci_tools_version: v1.2.1
3131
extension_name: msolap
32-
exclude_archs: 'linux_amd64;linux_amd64_gcc4;linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
32+
exclude_archs: 'linux_amd64;linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
3333
skip_tests: true
3434

CMakeLists.txt

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,31 @@ include_directories(src/include)
1414
# Add COM/OLE DB dependencies for Windows
1515
if(WIN32)
1616
set(COM_LIBS ole32 oleaut32 uuid)
17+
set(EXTENSION_SOURCES
18+
src/msolap_connection.cpp
19+
src/msolap_scanner.cpp
20+
src/msolap_utils.cpp
21+
src/msolap_extension.cpp
22+
)
1723
else()
18-
message(FATAL_ERROR "DuckDB MSOLAP Extension is only supported on Windows due to COM dependencies")
24+
# For non-Windows platforms, use a simplified implementation
25+
set(COM_LIBS "")
26+
set(EXTENSION_SOURCES
27+
src/msolap_extension_nowin.cpp
28+
)
1929
endif()
2030

21-
set(EXTENSION_SOURCES
22-
src/msolap_connection.cpp
23-
src/msolap_scanner.cpp
24-
src/msolap_utils.cpp
25-
src/msolap_extension.cpp
26-
)
27-
2831
add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
2932
set(PARAMETERS "-warnings")
3033
# build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
3134
build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})
3235

33-
target_link_libraries(${LOADABLE_EXTENSION_NAME} ${COM_LIBS})
36+
if(WIN32)
37+
target_link_libraries(${LOADABLE_EXTENSION_NAME} ${COM_LIBS})
38+
endif()
3439

3540
install(
3641
TARGETS ${EXTENSION_NAME}
3742
EXPORT "${DUCKDB_EXPORT_SET}"
3843
LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
39-
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}")
44+
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}")
File renamed without changes.

docs/NEXT_README.md

Lines changed: 0 additions & 86 deletions
This file was deleted.

docs/UPDATING.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)