Commit 09cd9411 authored by David Partyka's avatar David Partyka Committed by Kitware Robot
Browse files

Merge topic '0012667-fix-cross-compilation-regression' into pv-master

a6fe0122 Fix ParaView cross compilation.
parents 98ebfb9a a6fe0122
......@@ -140,8 +140,10 @@ SET(VTK_TCL_SUPPORT_LIBRARY_PATH "@VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG@")
SET(VTK_TK_SUPPORT_LIBRARY_PATH "@VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG@")
SET(VTK_TCL_TK_MACROS_MODULE "@VTK_TCL_TK_MACROS_MODULE_CONFIG@")
SET(VTK_TCL_HOME "@VTK_TCL_HOME_CONFIG@")
SET(VTK_WRAP_TCL_EXE "@VTK_WRAP_TCL_EXE_CONFIG@")
SET(VTK_WRAP_TCL_INIT_EXE "@VTK_WRAP_TCL_INIT_EXE_CONFIG@")
IF (NOT CMAKE_CROSS_COMPILING)
SET(VTK_WRAP_TCL_EXE "@VTK_WRAP_TCL_EXE_CONFIG@")
SET(VTK_WRAP_TCL_INIT_EXE "@VTK_WRAP_TCL_INIT_EXE_CONFIG@")
ENDIF (NOT CMAKE_CROSS_COMPILING)
SET(VTK_TK_INTERNAL_DIR "@VTK_TK_INTERNAL_DIR_CONFIG@")
SET(VTK_TK_RESOURCES_DIR "@VTK_TK_RESOURCES_DIR_CONFIG@")
SET(VTK_TCL_INCLUDE_DIR "@TCL_INCLUDE_PATH@")
......@@ -151,8 +153,10 @@ SET(VTK_TK_LIBRARY "@TK_LIBRARY@")
# The Java configuration.
SET(VTK_JAVA_JAR "@VTK_JAVA_JAR_CONFIG@")
SET(VTK_PARSE_JAVA_EXE "@VTK_PARSE_JAVA_EXE_CONFIG@")
SET(VTK_WRAP_JAVA_EXE "@VTK_WRAP_JAVA_EXE_CONFIG@")
IF (NOT CMAKE_CROSS_COMPILING)
SET(VTK_PARSE_JAVA_EXE "@VTK_PARSE_JAVA_EXE_CONFIG@")
SET(VTK_WRAP_JAVA_EXE "@VTK_WRAP_JAVA_EXE_CONFIG@")
ENDIF (NOT CMAKE_CROSS_COMPILING)
SET(VTK_JAVA_INCLUDE_DIR "@JAVA_INCLUDE_PATH@;@JAVA_INCLUDE_PATH2@")
SET(VTK_JAVA_AWT_LIBRARY "@JAVA_AWT_LIBRARY@")
SET(VTK_JVM_LIBRARY "@JAVA_JVM_LIBRARY@")
......@@ -166,13 +170,17 @@ SET(VTK_MATLAB_LIB_DIR "@MATLAB_LIB_DIR@")
# If VTK_CONFIGURATION_TYPES is set (see below) then the VTK_PYTHONPATH_DIRS
# will have subdirectories for each configuration type.
SET(VTK_PYTHONPATH_DIRS "@VTK_PYTHONPATH_DIRS_CONFIG@")
SET(VTK_WRAP_PYTHON_EXE "@VTK_WRAP_PYTHON_EXE_CONFIG@")
SET(VTK_WRAP_PYTHON_INIT_EXE "@VTK_WRAP_PYTHON_INIT_EXE_CONFIG@")
IF (NOT CMAKE_CROSS_COMPILING)
SET(VTK_WRAP_PYTHON_EXE "@VTK_WRAP_PYTHON_EXE_CONFIG@")
SET(VTK_WRAP_PYTHON_INIT_EXE "@VTK_WRAP_PYTHON_INIT_EXE_CONFIG@")
ENDIF (NOT CMAKE_CROSS_COMPILING)
SET(VTK_PYTHON_INCLUDE_DIR "@PYTHON_INCLUDE_DIR@")
SET(VTK_PYTHON_LIBRARY "@PYTHON_LIBRARY@")
# Other executables
SET(VTK_ENCODESTRING_EXE "@VTK_ENCODESTRING_EXE_CONFIG@")
IF (NOT CMAKE_CROSS_COMPILING)
SET(VTK_ENCODESTRING_EXE "@VTK_ENCODESTRING_EXE_CONFIG@")
ENDIF (NOT CMAKE_CROSS_COMPILING)
# The Doxygen configuration.
SET(VTK_DOXYGEN_HOME "@VTK_DOXYGEN_HOME_CONFIG@")
......
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