Commit 756d6a1e authored by David Cole's avatar David Cole
Browse files

ENH: Merge changes from ParaView-2-4 into VTK-5-0 branch to refix bug 2904.

cvs -q up -j1.1.4.1 Parallel/VTKParallelCMakeTests.cmake
cvs -q up -j1.346.2.2 -j1.346.2.3 CMakeLists.txt
cvs -q up -j1.142 -j1.142.2.1 Parallel/CMakeLists.txt
parent d0a0c45e
......@@ -564,6 +564,8 @@ IF("VTK_TYPE_CHAR_IS_SIGNED" MATCHES "^VTK_TYPE_CHAR_IS_SIGNED$")
ENDIF(VTK_TYPE_CHAR_IS_SIGNED_COMPILED)
ENDIF("VTK_TYPE_CHAR_IS_SIGNED" MATCHES "^VTK_TYPE_CHAR_IS_SIGNED$")
INCLUDE(Parallel/VTKParallelCMakeTests.cmake)
# Check for explicit template instantiation support by compiler.
INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkTestExplicitInstantiation.cmake)
......
......@@ -13,39 +13,6 @@ IF (WIN32)
ENDIF (NOT BORLAND)
ENDIF (WIN32)
# See if we need to link the socket library
INCLUDE(${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
CHECK_LIBRARY_EXISTS("socket" getsockname "" VTK_HAVE_LIBSOCKET)
IF("VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T" MATCHES "^VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T$")
IF(VTK_HAVE_LIBSOCKET)
SET(VTK_GETSOCKNAME_LIBS "socket")
ELSE(VTK_HAVE_LIBSOCKET)
SET(VTK_GETSOCKNAME_LIBS)
ENDIF(VTK_HAVE_LIBSOCKET)
MESSAGE(STATUS "Checking for getsockname with socklen_t")
TRY_COMPILE(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T
${VTK_BINARY_DIR}/CMakeTmp/SocklenT
${VTK_SOURCE_DIR}/CMake/vtkTestSocklenT.cxx
CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=${VTK_GETSOCKNAME_LIBS}"
OUTPUT_VARIABLE OUTPUT)
IF(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
MESSAGE(STATUS "Checking for getsockname with socklen_t -- yes")
SET(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T 1 CACHE INTERNAL "Support for getsockname with socklen_t")
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
"Determining if getsockname accepts socklen_t type "
"passed with the following output:\n"
"${OUTPUT}\n" APPEND)
ELSE(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
MESSAGE(STATUS "Checking for getsockname with socklen_t -- no")
SET(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T 0 CACHE INTERNAL "Support for getsockname with socklen_t")
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Determining if getsockname accepts socklen_t type "
"failed with the following output:\n"
"${OUTPUT}\n" APPEND)
ENDIF(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
ENDIF("VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T" MATCHES "^VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T$")
SET ( Kit_SRCS
vtkDuplicatePolyData.cxx
vtkBranchExtentTranslator.cxx
......
# See if we need to link the socket library
INCLUDE(${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
CHECK_LIBRARY_EXISTS("socket" getsockname "" VTK_HAVE_LIBSOCKET)
IF("VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T" MATCHES "^VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T$")
IF(VTK_HAVE_LIBSOCKET)
SET(VTK_GETSOCKNAME_LIBS "socket")
ELSE(VTK_HAVE_LIBSOCKET)
SET(VTK_GETSOCKNAME_LIBS)
ENDIF(VTK_HAVE_LIBSOCKET)
MESSAGE(STATUS "Checking for getsockname with socklen_t")
TRY_COMPILE(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T
${VTK_BINARY_DIR}/CMakeTmp/SocklenT
${VTK_SOURCE_DIR}/CMake/vtkTestSocklenT.cxx
CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=${VTK_GETSOCKNAME_LIBS}"
OUTPUT_VARIABLE OUTPUT)
IF(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
MESSAGE(STATUS "Checking for getsockname with socklen_t -- yes")
SET(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T 1 CACHE INTERNAL "Support for getsockname with socklen_t")
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
"Determining if getsockname accepts socklen_t type "
"passed with the following output:\n"
"${OUTPUT}\n" APPEND)
ELSE(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
MESSAGE(STATUS "Checking for getsockname with socklen_t -- no")
SET(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T 0 CACHE INTERNAL "Support for getsockname with socklen_t")
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Determining if getsockname accepts socklen_t type "
"failed with the following output:\n"
"${OUTPUT}\n" APPEND)
ENDIF(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
ENDIF("VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T" MATCHES "^VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T$")
Markdown is supported
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