Commit b79ec075 authored by Brad King's avatar Brad King
Browse files

ERR: VTK_SELECT_STREAMS_LIBRARY needs to know the location of the VTK source directory.

parent 0fabf9f1
...@@ -4,7 +4,7 @@ INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake) ...@@ -4,7 +4,7 @@ INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Macro to select whether to use old streams or ANSI streams. # Macro to select whether to use old streams or ANSI streams.
# Argument is the variable to set with the result (VTK_USE_ANSI_STDLIB). # Argument is the variable to set with the result (VTK_USE_ANSI_STDLIB).
MACRO(VTK_SELECT_STREAMS_LIBRARY var) MACRO(VTK_SELECT_STREAMS_LIBRARY var VTK_SOURCE_DIR)
IF("${var}" MATCHES "^${var}$") IF("${var}" MATCHES "^${var}$")
CHECK_INCLUDE_FILE_CXX("iosfwd" VTK_HAVE_ANSI_STREAMS) CHECK_INCLUDE_FILE_CXX("iosfwd" VTK_HAVE_ANSI_STREAMS)
CHECK_INCLUDE_FILE_CXX("iostream.h" VTK_HAVE_OLD_STREAMS) CHECK_INCLUDE_FILE_CXX("iostream.h" VTK_HAVE_OLD_STREAMS)
...@@ -28,7 +28,7 @@ MACRO(VTK_SELECT_STREAMS_LIBRARY var) ...@@ -28,7 +28,7 @@ MACRO(VTK_SELECT_STREAMS_LIBRARY var)
IF("VTK_COMPILER_IS_VC6" MATCHES "^VTK_COMPILER_IS_VC6$") IF("VTK_COMPILER_IS_VC6" MATCHES "^VTK_COMPILER_IS_VC6$")
MESSAGE(STATUS "Checking if compiler is VC6") MESSAGE(STATUS "Checking if compiler is VC6")
TRY_COMPILE(VTK_COMPILER_IS_VC6 TRY_COMPILE(VTK_COMPILER_IS_VC6
${VTK_BINARY_DIR}/CMakeTmp ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
${VTK_SOURCE_DIR}/CMake/vtkTestCompilerIsVC6.cxx ${VTK_SOURCE_DIR}/CMake/vtkTestCompilerIsVC6.cxx
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
IF(VTK_COMPILER_IS_VC6) IF(VTK_COMPILER_IS_VC6)
......
...@@ -299,7 +299,7 @@ ENDIF(VTK_USE_CARBON AND VTK_USE_COCOA) ...@@ -299,7 +299,7 @@ ENDIF(VTK_USE_CARBON AND VTK_USE_COCOA)
# Select a streams library. # Select a streams library.
INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkSelectStreamsLibrary.cmake) INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkSelectStreamsLibrary.cmake)
VTK_SELECT_STREAMS_LIBRARY(VTK_USE_ANSI_STDLIB) VTK_SELECT_STREAMS_LIBRARY(VTK_USE_ANSI_STDLIB ${VTK_SOURCE_DIR})
# Check the severity of EOF bugs in the streams library. # Check the severity of EOF bugs in the streams library.
SET(VTK_TEST_STREAM_EOF_CXX ${VTK_SOURCE_DIR}/CMake/vtkTestStreamEOF.cxx.in) SET(VTK_TEST_STREAM_EOF_CXX ${VTK_SOURCE_DIR}/CMake/vtkTestStreamEOF.cxx.in)
......
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