Skip to content

Commit f17376c

Browse files
authored
Merge pull request #15 from sy-c/master
fix tcl lib & nodejs for osx
2 parents 7c818f9 + f6577ac commit f17376c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ if(SWIG_FOUND)
299299
set(CMAKE_SWIG_FLAGS -module infoLoggerForTcl)
300300
swig_add_library(infoLoggerForTcl LANGUAGE tcl SOURCES src/infoLogger.i ${INFOLOGGER_LIB_OBJECTS})
301301
target_include_directories(${SWIG_MODULE_infoLoggerForTcl_REAL_NAME} PRIVATE ${INFOLOGGER_INCLUDE_DIRS})
302+
target_link_libraries(${SWIG_MODULE_infoLoggerForTcl_REAL_NAME} ${TCL_LIBRARY})
302303
set_target_properties(${SWIG_MODULE_infoLoggerForTcl_REAL_NAME} PROPERTIES OUTPUT_NAME infoLoggerForTcl)
303304
install(TARGETS ${SWIG_MODULE_infoLoggerForTcl_REAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
304305
endif()
@@ -337,7 +338,7 @@ if(SWIG_FOUND)
337338
#library for Javascript / node.js
338339
find_program(NODE_EXECUTABLE node)
339340
get_filename_component(NODE_DIR ${NODE_EXECUTABLE} DIRECTORY)
340-
find_path(NODEJS_INCLUDE_DIRS NAMES node.h PATHS ${Nodejs_ROOT} ${Nodejs_ROOT}/include ${NODE_DIR}/../include/node)
341+
find_path(NODEJS_INCLUDE_DIRS NAMES node.h NO_DEFAULT_PATH PATHS ${Nodejs_ROOT} ${Nodejs_ROOT}/include ${NODE_DIR}/../include/node)
341342
if (NODEJS_INCLUDE_DIRS)
342343
message("Bindings for node.js will be generated")
343344
message("Using NODEJS_INCLUDE_DIRS=${NODEJS_INCLUDE_DIRS}")

0 commit comments

Comments
 (0)