Skip to content

Commit

Permalink
Bring object library generic_tile_io into conformance with standalo…
Browse files Browse the repository at this point in the history
…ne link policy

PR #4051 took object library `generic_tile_io` out of conformance with the policy that each OL should link standalone. This PR corrects this.
  • Loading branch information
eric-hughes-tiledb committed May 14, 2024
1 parent 6aca860 commit 77f36b7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
*
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
Expand Down
2 changes: 1 addition & 1 deletion tiledb/sm/array_schema/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@ conclude(object_library)
# the principle that object libraries must compile as standalone modules. As
# long as this directive is necessary to have to the compile test pass, we
# cannot consider `array_schema` as a properly-constructed object library.
target_link_libraries(compile_array_schema PRIVATE context_resources generic_tile_io)
target_link_libraries(compile_array_schema PRIVATE generic_tile_io)

add_test_subdirectory()
7 changes: 1 addition & 6 deletions tiledb/sm/tile/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,12 @@ commence(object_library generic_tile_io)
baseline
buffer
constants
context_resources
tiledb_crypto
filter_pipeline
tile
vfs
)
conclude(object_library)

# This is linked outside the object_library scope because ContextResources
# is recompiled as part of the capi_context_stub. Including context_resources
# here like this prevents many headaches revolving around duplicate symbols
# when linking executables.
target_link_libraries(compile_generic_tile_io PRIVATE context_resources)

add_test_subdirectory()

0 comments on commit 77f36b7

Please sign in to comment.