Commit c2e53e70 authored by Brad King's avatar Brad King

BUG: Reorganized top-level CMakeLists.txt file to set require C and C++ flags...

BUG: Reorganized top-level CMakeLists.txt file to set require C and C++ flags before doing try compiles.  This involved a cleanup of X11 search/use code.  It no longer depends on CMake's backward compatibility search for it.
parent 8a85ad18
This diff is collapsed.
......@@ -460,6 +460,5 @@ IF (VTK_WRAP_PYTHON)
ENDIF (VTK_WRAP_PYTHON)
IF(VTK_USE_X)
TARGET_LINK_LIBRARIES(vtk${KIT} -lXt ${CMAKE_X_LIBS})
ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
TARGET_LINK_LIBRARIES(vtk${KIT} -lXt ${X11_LIBRARIES})
ENDIF(VTK_USE_X)
......@@ -15,8 +15,7 @@ IF(VTK_USE_RENDERING)
IF(VTK_USE_X)
# X include directories.
SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM}
${CMAKE_Xlib_INCLUDE_PATH} ${CMAKE_Xutil_INCLUDE_PATH})
SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${X11_INCLUDE_DIR})
ENDIF(VTK_USE_X)
IF(VTK_HAVE_VP1000)
......
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