Skip to content

Commit acb3ea0

Browse files
authored
Add build system hook (#4586)
This is a minor change to allow for using the newly added C API macros in projects that build libtiledb from source. --- TYPE: NO_HISTORY DESC: Add build system hook
1 parent 0e6a716 commit acb3ea0

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,3 +593,16 @@ add_custom_target(
593593
COMMAND rmdir "${CMAKE_INSTALL_PREFIX}/include/tiledb"
594594
COMMAND echo "TileDB uninstalled"
595595
)
596+
597+
###########################################################
598+
# Run the optional extra cmake include
599+
###########################################################
600+
601+
if(TILEDB_EXTRA_CMAKE_INCLUDE)
602+
get_filename_component(
603+
EXTRA_INCLUDE_ABSPATH
604+
"${TILEDB_EXTRA_CMAKE_INCLUDE}"
605+
ABSOLUTE
606+
)
607+
include("${EXTRA_INCLUDE_ABSPATH}")
608+
endif()

cmake/TileDB-Superbuild.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ set(INHERITED_CMAKE_ARGS
3434
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
3535
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
3636
-DCOMPILER_SUPPORTS_AVX2=${COMPILER_SUPPORTS_AVX2}
37+
-DTILEDB_EXTRA_CMAKE_INCLUDE=${TILEDB_EXTRA_CMAKE_INCLUDE}
3738
-DTILEDB_VCPKG=${TILEDB_VCPKG}
3839
-DTILEDB_VERBOSE=${TILEDB_VERBOSE}
3940
-DTILEDB_ASSERTIONS=${TILEDB_ASSERTIONS}

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tiledb",
33
"version-string": "2.15.0",
4-
"builtin-baseline": "f14984af3738e69f197bf0e647a8dca12de92996",
4+
"builtin-baseline": "c0b1007fe7fc6ccc902e6c708fd6a670ddad8f9d",
55
"dependencies": [
66
"bzip2",
77
"libmagic",

0 commit comments

Comments
 (0)