Skip to content

Commit 11701a5

Browse files
Remove references to libndt and refer only to libdyndt for consistency.
1 parent 85d6d11 commit 11701a5

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ foreach(module dynd.ndt.type dynd.ndt.json)
251251
PROPERTY COMPILE_DEFINITIONS PYDYND_EXPORT
252252
)
253253
if(DYND_INSTALL_LIB)
254-
target_link_libraries(${module} "${LIBNDT_LIBRARY}")
254+
target_link_libraries(${module} "${LIBDYNDT_LIBRARY}")
255255
else()
256256
target_link_libraries(${module} libdyndt)
257257
if(UNIX)

cmake/FindLibDyND.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ if("${_LIBDYND_CONFIG}" STREQUAL "")
6060
else()
6161

6262
# Get the ndt library to link against.
63-
execute_process(COMMAND "${_LIBDYND_CONFIG}" "-libndtname"
63+
execute_process(COMMAND "${_LIBDYND_CONFIG}" "-libdyndtname"
6464
RESULT_VARIABLE _DYND_SEARCH_SUCCESS
65-
OUTPUT_VARIABLE LIBNDT_NAME
65+
OUTPUT_VARIABLE LIBDYNDT_NAME
6666
ERROR_VARIABLE _DYND_ERROR_VALUE
6767
OUTPUT_STRIP_TRAILING_WHITESPACE)
6868
if(NOT _DYND_SEARCH_SUCCESS MATCHES 0)
@@ -93,7 +93,7 @@ else()
9393
string(REPLACE "\\" "/" LIBDYND_LIBRARY_DIR ${LIBDYND_LIBRARY_DIR})
9494
endif()
9595

96-
set(LIBNDT_LIBRARY "${LIBDYND_LIBRARY_DIR}/${LIBNDT_NAME}")
96+
set(LIBDYNDT_LIBRARY "${LIBDYND_LIBRARY_DIR}/${LIBDYNDT_NAME}")
9797

9898
set(LIBDYND_LIBRARIES "")
9999
foreach(_lib ${LIBDYND_LIBRARY_NAMES})

0 commit comments

Comments
 (0)