Commit ffe850c1 authored by David Partyka's avatar David Partyka
Browse files

Merge branch 'fix-mac-forwarding-vtk-vtkpython' into release

parents 98ae0f96 8d3fd112
...@@ -1508,7 +1508,7 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT) ...@@ -1508,7 +1508,7 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
# Use fixup_bundle to pull in vtk and vtkpython dependencies # Use fixup_bundle to pull in vtk and vtkpython dependencies
IF(VTK_INSTALL_THIRD_PARTY_LIBRARIES) IF(VTK_INSTALL_THIRD_PARTY_LIBRARIES AND NOT APPLE)
ADD_SUBDIRECTORY(Utilities/Release) ADD_SUBDIRECTORY(Utilities/Release)
ENDIF() ENDIF()
......
...@@ -90,14 +90,14 @@ if(WIN32) ...@@ -90,14 +90,14 @@ if(WIN32)
list(APPEND lib_search_dir "${VTK_BINARY_DIR}/bin/Release") list(APPEND lib_search_dir "${VTK_BINARY_DIR}/bin/Release")
endif() endif()
if(VTK_WRAP_TCL) if(VTK_WRAP_TCL AND NOT APPLE)
get_filename_component(TCL_BIN_DIR "${TCL_TCLSH}" PATH) get_filename_component(TCL_BIN_DIR "${TCL_TCLSH}" PATH)
get_filename_component(TCL_LIB_DIR "${TCL_LIBRARY}" PATH) get_filename_component(TCL_LIB_DIR "${TCL_LIBRARY}" PATH)
get_filename_component(TK_LIB_DIR "${TK_LIBRARY}" PATH) get_filename_component(TK_LIB_DIR "${TK_LIBRARY}" PATH)
list(APPEND lib_search_dir ${TCL_BIN_DIR} ${TCL_BIN_DIR} ${TK_LIB_DIR}) list(APPEND lib_search_dir ${TCL_BIN_DIR} ${TCL_BIN_DIR} ${TK_LIB_DIR})
endif() endif()
if(VTK_WRAP_PYTHON) if(VTK_WRAP_PYTHON AND NOT APPLE)
list(APPEND lib_search_dir ${PYTHON_BIN_DIR} ${PYTHON_LIB_DIR}) list(APPEND lib_search_dir ${PYTHON_BIN_DIR} ${PYTHON_LIB_DIR})
if(WIN32) if(WIN32)
list(APPEND lib_search_dir ${PYTHON_BIN_DIR}/DLLs) list(APPEND lib_search_dir ${PYTHON_BIN_DIR}/DLLs)
......
...@@ -282,6 +282,7 @@ static void vtkPythonAppInitPrependPath(const char* self_dir) ...@@ -282,6 +282,7 @@ static void vtkPythonAppInitPrependPath(const char* self_dir)
const char* inst_dirs[] = { const char* inst_dirs[] = {
"/lib/python" VTK_PYTHON_VERSION "/site-packages/vtk", // UNIX --prefix "/lib/python" VTK_PYTHON_VERSION "/site-packages/vtk", // UNIX --prefix
"/python" VTK_PYTHON_VERSION "/site-packages/vtk", // UNIX + Forwarding exe --prefix "/python" VTK_PYTHON_VERSION "/site-packages/vtk", // UNIX + Forwarding exe --prefix
"/../Library/Python/" VTK_PYTHON_VERSION "/site-packages/vtk", // Apple + Forwarding exe
"/lib/python/vtk", // UNIX --home "/lib/python/vtk", // UNIX --home
"/Lib/site-packages/vtk", "/Lib/vtk", // Windows "/Lib/site-packages/vtk", "/Lib/vtk", // Windows
"/site-packages/vtk", "/vtk", // Windows "/site-packages/vtk", "/vtk", // Windows
......
...@@ -338,6 +338,7 @@ int Tcl_AppInit(Tcl_Interp *interp) ...@@ -338,6 +338,7 @@ int Tcl_AppInit(Tcl_Interp *interp)
*/ */
static char script[] = static char script[] =
"foreach dir [list " "foreach dir [list "
" [file dirname [file dirname [info nameofexecutable]]]"
#if defined(CMAKE_INTDIR) #if defined(CMAKE_INTDIR)
" [file join [file dirname [file dirname [file dirname [info nameofexecutable]]]] Wrapping Tcl " CMAKE_INTDIR "]" " [file join [file dirname [file dirname [file dirname [info nameofexecutable]]]] Wrapping Tcl " CMAKE_INTDIR "]"
#else #else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment