Skip to content

Commit b2a388f

Browse files
Merge pull request #692 from insertinterestingnamehere/libdyndt
Only link config module against libdyndt and not libdynd.
2 parents 669d248 + bd26f08 commit b2a388f

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,7 @@ set_source_files_properties(dynd/config.pyx PROPERTIES CYTHON_API 1)
183183

184184
cython_add_module(dynd.config dynd.config_pyx True
185185
dynd/include/exception_translation.hpp
186-
dynd/src/array_conversions.cpp
187186
dynd/src/type_conversions.cpp
188-
dynd/src/type_deduction.cpp
189187
${CMAKE_CURRENT_BINARY_DIR}/dynd/src/git_version.cpp
190188
)
191189

@@ -246,7 +244,7 @@ postprocess_cython( postprocess.py dynd.nd.array_postprocess dynd.nd.array_pyx d
246244
postprocess_cython( postprocess.py dynd.nd.callable_postprocess dynd.nd.callable_pyx dynd.nd.callable)
247245

248246
# Linker commands for the dynd.ndt module.
249-
foreach(module dynd.ndt.type dynd.ndt.json)
247+
foreach(module dynd.config dynd.ndt.type dynd.ndt.json)
250248
# Temporarily continue to define PYDYND_EXPORT to avoid inconsistent linkage warnings.
251249
# This should be removed once the macros have been refactored to hide all symbols
252250
# other than module initialization routines.
@@ -282,7 +280,7 @@ foreach(module dynd.ndt.type dynd.ndt.json)
282280
endforeach(module)
283281

284282
# Linker commands for the dynd.nd module.
285-
foreach(module dynd.config dynd.nd.array dynd.nd.callable dynd.nd.functional dynd.nd.registry)
283+
foreach(module dynd.nd.array dynd.nd.callable dynd.nd.functional dynd.nd.registry)
286284
# Temporarily continue to define PYDYND_EXPORT to avoid inconsistent linkage warnings.
287285
# This should be removed once the macros have been refactored to hide all symbols
288286
# other than module initialization routines.

0 commit comments

Comments
 (0)