[cmake-commits] martink committed VTKCompatibility.cmake 1.5 1.6

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Dec 12 11:17:07 EST 2006


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv26222

Modified Files:
	VTKCompatibility.cmake 
Log Message:
ENH: minor cleanup


Index: VTKCompatibility.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/VTKCompatibility.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VTKCompatibility.cmake	16 Nov 2006 20:29:46 -0000	1.5
+++ VTKCompatibility.cmake	12 Dec 2006 16:17:04 -0000	1.6
@@ -1,21 +1,33 @@
 IF(APPLE)
   SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY}")
   SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}")
-  STRING( REGEX REPLACE "CMAKE_C_COMPILER" CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
-  STRING( REGEX REPLACE "CMAKE_C_COMPILER" CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
+  STRING( REGEX REPLACE "CMAKE_C_COMPILER" 
+    CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_MODULE 
+    "${CMAKE_CXX_CREATE_SHARED_MODULE}")
+  STRING( REGEX REPLACE "CMAKE_C_COMPILER" 
+    CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_LIBRARY 
+    "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
 ENDIF(APPLE)
 
-SET(VTKFTGL_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/ftgl" CACHE INTERNAL "")
-SET(VTKFREETYPE_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/freetype" CACHE INTERNAL "")
-SET(VTKFTGL_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/ftgl" CACHE INTERNAL "")
-SET(VTKFREETYPE_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/freetype" CACHE INTERNAL "")
+SET(VTKFTGL_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/ftgl" 
+  CACHE INTERNAL "")
+SET(VTKFREETYPE_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/freetype" 
+  CACHE INTERNAL "")
+SET(VTKFTGL_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/ftgl" 
+  CACHE INTERNAL "")
+SET(VTKFREETYPE_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/freetype" 
+  CACHE INTERNAL "")
 
-SET(VTK_GLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glext.h" CACHE FILEPATH 
+SET(VTK_GLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glext.h" 
+  CACHE FILEPATH 
   "Location of the OpenGL extensions header file (glext.h).")
-SET(VTK_GLXEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glxext.h" CACHE FILEPATH
+SET(VTK_GLXEXT_FILE 
+  "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glxext.h" CACHE FILEPATH
   "Location of the GLX extensions header file (glxext.h).")
-SET(VTK_WGLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/wglext.h" CACHE FILEPATH
+SET(VTK_WGLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/wglext.h" 
+  CACHE FILEPATH
   "Location of the WGL extensions header file (wglext.h).")
 
 # work around an old bug in VTK
 SET(TIFF_RIGHT_VERSION 1)
+



More information about the Cmake-commits mailing list