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

Fix selection of VTK thread implementation

Remove use of old CMakeBackwardCompatibilityC variables:

 CMAKE_USE_PTHREADS
 CMAKE_USE_SPROC
 CMAKE_HP_PTHREADS
 CMAKE_USE_WIN32_THREADS
 CMAKE_NO_STD_NAMESPACE
 CMAKE_ANSI_FOR_SCOPE

Use of these was originally removed by

 commit fe401e0f (Remove old CMakeBackwardCompatibilityC thread options, 2012-02-23)
 commit e56a7eb9 (Drop workaround for no std:: namespace, 2012-02-23)
 commit ff74963a (Drop workaround for non-ANSI 'for' scope, 2012-02-23)

but accidentally restored by modularization.  Drop use of the variables
again.  The thread variables in particular interfere with the thread
library selection done by the top-level CMakeLists.txt file.

While at it, drop unused computation of VTK_USE_OPENGL_LIBRARY from
Common/Core.  Its value is hard-coded in Rendering/OpenGL when the
module is enabled.

Change-Id: Ife7730fbfe32c51f0c431d440935636b2bb34c39
parent 6214dd05
......@@ -214,18 +214,11 @@ macro(VTK_PREPARE_CMAKEDEFINE not invar outvar)
endmacro()
vtk_prepare_cmakedefine("" CMAKE_WORDS_BIGENDIAN VTK_WORDS_BIGENDIAN)
vtk_prepare_cmakedefine("" CMAKE_USE_PTHREADS VTK_USE_PTHREADS)
vtk_prepare_cmakedefine("" CMAKE_USE_SPROC VTK_USE_SPROC)
vtk_prepare_cmakedefine("" CMAKE_HP_PTHREADS VTK_HP_PTHREADS)
vtk_prepare_cmakedefine("" CMAKE_USE_WIN32_THREADS VTK_USE_WIN32_THREADS)
vtk_prepare_cmakedefine("" CMAKE_NO_ANSI_STRING_STREAM VTK_NO_ANSI_STRING_STREAM)
vtk_prepare_cmakedefine("" CMAKE_NO_STD_NAMESPACE VTK_NO_STD_NAMESPACE)
vtk_prepare_cmakedefine(NOT CMAKE_ANSI_FOR_SCOPE VTK_NO_FOR_SCOPE)
vtk_prepare_cmakedefine(NOT VTK_EXPLICIT_TEMPLATES
VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION)
vtk_prepare_cmakedefine(NOT VTK_COMPILER_HAS_FULL_SPECIALIZATION
VTK_NO_FULL_TEMPLATE_SPECIALIZATION)
vtk_prepare_cmakedefine("" OPENGL_LIBRARY VTK_USE_OPENGL_LIBRARY)
# Provide version macros through vtkConfigure.h for compatibility.
if(VTK_LEGACY_REMOVE)
......
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