Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev: Avoid adding name_extension for extensions with DONT_LINK #9496

Merged
merged 1 commit into from Oct 30, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
Expand Up @@ -203,7 +203,7 @@
endif()

option(EXPLICIT_EXCEPTIONS "Explicitly enable C++ exceptions." FALSE)
if(${EXPLICIT_EXCEPTIONS})

Check warning on line 206 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Linux Extensions (ggc4)

TIFF support is not enabled and will result in the inability to read some

Check warning on line 206 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Windows Extensions (64-bit)

TIFF support is not enabled and will result in the inability to read some
set(CXX_EXTRA "${CXX_EXTRA} -fexceptions")
endif()

Expand Down Expand Up @@ -439,7 +439,7 @@
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CXX_EXTRA_DEBUG}")
else()
message(WARNING "Please use a recent compiler for debug builds")

Check warning on line 442 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Linux Extensions (x64)

Please use a recent compiler for debug builds

Check warning on line 442 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Linux Extensions (x64)

Please use a recent compiler for debug builds
endif()
else()
set(CMAKE_CXX_WINDOWS_FLAGS
Expand Down Expand Up @@ -604,7 +604,10 @@

function(add_extension_dependencies LIBRARY)
foreach(EXT_NAME IN LISTS DUCKDB_EXTENSION_NAMES)
add_dependencies(${LIBRARY} ${EXT_NAME}_extension)
string(TOUPPER ${EXT_NAME} EXTENSION_NAME_UPPERCASE)
if (DUCKDB_EXTENSION_${EXTENSION_NAME_UPPERCASE}_SHOULD_LINK)
add_dependencies(${LIBRARY} ${EXT_NAME}_extension)
endif()
endforeach()
endfunction()

Expand Down