Commit a819eac4 authored by Francois Bertel's avatar Francois Bertel

COMP:typo in VTK/Rendering/CMakeLists.txt (KIT_SRCS when it should be...

COMP:typo in VTK/Rendering/CMakeLists.txt (KIT_SRCS when it should be Kit_SRCS) prevented compiling GPUInfo files. Report VTK_USE_DIRECTX, VTK_USE_CORE_GRAPHICS and VTK_USE_NVCONTROL in VTK/vtkToolkits.h.in (might be changed to vtkConfigure.h.in if anybody complain).
parent 99e33d0e
......@@ -328,18 +328,18 @@ SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
# on Windows
#message("DirectX_FOUND=${DirectX_FOUND}")
if(DirectX_FOUND)
set(KIT_SRCS ${KIT_SRCS} vtkDirectXGPUInfoList)
set(Kit_SRCS ${Kit_SRCS} vtkDirectXGPUInfoList.cxx)
endif(DirectX_FOUND)
# on Mac
if(ApplicationServices_FOUND)
set(KIT_SRCS ${KIT_SRCS} vtkCoreGraphicsGPUInfoList.mm)
endif(ApplicationServices_FOUND)
set(Kit_SRCS ${Kit_SRCS} vtkCoreGraphicsGPUInfoList.mm)
endif()
# on Linux, for Nvidia
if(VTK_USE_X)
set(KIT_SRCS ${KIT_SRCS} vtkXGPUInfoList)
endif(VTK_USE_X)
set(Kit_SRCS ${Kit_SRCS} vtkXGPUInfoList.cxx)
endif()
SET(Kit_SRCS ${Kit_SRCS} vtkFreeTypeUtilities.cxx )
SET_SOURCE_FILES_PROPERTIES(vtkFreeTypeUtilities WRAP_EXCLUDE)
......
......@@ -21,11 +21,13 @@
#include <assert.h>
#include <X11/Xlib.h> // Display structure, XOpenDisplay(), XScreenCount()
#include "vtkToolkits.h"
#ifdef VTK_USE_NVCONTROL
#include "NVCtrlLib.h" // needs NVCtrl.h (NV_CTRL_VIDEO_RAM, XNVCTRLQueryAttribute() )
#endif
vtkCxxRevisionMacro(vtkXGPUInfoList, "1.1");
vtkCxxRevisionMacro(vtkXGPUInfoList, "1.2");
vtkStandardNewMacro(vtkXGPUInfoList);
// ----------------------------------------------------------------------------
......
......@@ -136,6 +136,11 @@
/* Whether the user has built the MetaIO library or not */
#cmakedefine VTK_USE_METAIO
/* Options for GPUInfo */
#cmakedefine VTK_USE_DIRECTX
#cmakedefine VTK_USE_CORE_GRAPHICS
#cmakedefine VTK_USE_NVCONTROL
/*--------------------------------------------------------------------------*/
/* Setup VTK based on platform features and configuration. */
......
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