Fri Oct 9 16:11:13 EDT 2009

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

Modified Files:
      Tag: CMake-2-8
	CMakeCInformation.cmake CMakeCXXInformation.cmake 
	CMakeDetermineCompilerABI.cmake CMakeDetermineSystem.cmake 
	CMakeFortranInformation.cmake CMakeParseImplicitLinkInfo.cmake 
	CPack.RuntimeScript.in FindBISON.cmake FindBoost.cmake 
	FindCUDA.cmake FindFLEX.cmake FindGnuTLS.cmake 
	FindPkgConfig.cmake FindProtobuf.cmake FindQt3.cmake 
	FindQt4.cmake FindVTK.cmake NSIS.template.in 
	TestForANSIForScope.cmake TestForANSIStreamHeaders.cmake 
	TestForSSTREAM.cmake 
Log Message:
Merge in changes for RC 3

Index: FindGnuTLS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGnuTLS.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** FindGnuTLS.cmake	1 Oct 2009 21:20:29 -0000	1.1.2.1
--- FindGnuTLS.cmake	9 Oct 2009 20:11:10 -0000	1.1.2.2
***************
*** 41,49 ****
  ENDIF (NOT WIN32)

! FIND_PATH(GNUTLS_INCLUDE_DIR gnutls.h
     HINTS
     ${PC_GNUTLS_INCLUDEDIR}
     ${PC_GNUTLS_INCLUDE_DIRS}
-    PATH_SUFFIXES gnutls
     )

--- 41,48 ----
  ENDIF (NOT WIN32)

! FIND_PATH(GNUTLS_INCLUDE_DIR gnutls/gnutls.h
     HINTS
     ${PC_GNUTLS_INCLUDEDIR}
     ${PC_GNUTLS_INCLUDE_DIRS}
     )

***************
*** 54,57 ****
--- 53,58 ----
     )

+ MARK_AS_ADVANCED(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
+ 
  # handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if 
  # all listed variables are TRUE
***************
*** 59,65 ****
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)

! MARK_AS_ADVANCED(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
! 
! SET(GNUTLS_LIBRARIES    ${GNUTLS_LIBRARY})
! SET(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR})

--- 60,66 ----
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)

! IF(GNUTLS_FOUND)
!     SET(GNUTLS_LIBRARIES    ${GNUTLS_LIBRARY})
!     SET(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR})
! ENDIF()

Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C 2 -d -r1.38 -r1.38.2.1
*** NSIS.template.in	24 Sep 2009 18:59:24 -0000	1.38
--- NSIS.template.in	9 Oct 2009 20:11:11 -0000	1.38.2.1
***************
*** 706,713 ****
    Call ConditionalAddToRegisty

- @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
-   
    !insertmacro MUI_STARTMENU_WRITE_END

  SectionEnd

--- 706,713 ----
    Call ConditionalAddToRegisty

    !insertmacro MUI_STARTMENU_WRITE_END

+ @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
+ 
  SectionEnd

Index: FindPkgConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPkgConfig.cmake,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -C 2 -d -r1.7.4.1 -r1.7.4.2
*** FindPkgConfig.cmake	1 Oct 2009 21:20:32 -0000	1.7.4.1
--- FindPkgConfig.cmake	9 Oct 2009 20:11:10 -0000	1.7.4.2
***************
*** 70,73 ****
--- 70,74 ----
  #=============================================================================
  # Copyright 2006-2009 Kitware, Inc.
+ # Copyright 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
  #
  # Distributed under the OSI-approved BSD License (the "License");
***************
*** 81,108 ****
  #  License text for the above reference.)

- # Copyright (C) 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
- #
- # Redistribution and use, with or without modification, are permitted
- # provided that the following conditions are met:
- # 
- #    1. Redistributions must retain the above copyright notice, this
- #       list of conditions and the following disclaimer.
- #    2. The name of the author may not be used to endorse or promote
- #       products derived from this software without specific prior
- #       written permission.
- # 
- # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- # GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- 
  ### Common stuff ####
  set(PKG_CONFIG_VERSION 1)
--- 82,85 ----

Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -C 2 -d -r1.25.2.1 -r1.25.2.2
*** CMakeCInformation.cmake	1 Oct 2009 21:20:17 -0000	1.25.2.1
--- CMakeCInformation.cmake	9 Oct 2009 20:11:10 -0000	1.25.2.2
***************
*** 59,69 ****
      OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
  ENDIF (NOT _INCLUDED_FILE)
! # some systems include the compiler information in the system file
! # and if this is the enable_language command then it may not have been
! # included at this point, or needs to be included again so that the
! # language_INIT variables are set correctly
  IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME} 
!     OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
  ENDIF (NOT _INCLUDED_FILE)

--- 59,68 ----
      OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
  ENDIF (NOT _INCLUDED_FILE)
! # We specify the compiler information in the system file for some
! # platforms, but this language may not have been enabled when the file
! # was first included.  Include it again to get the language info.
! # Remove this when all compiler info is removed from system files.
  IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
  ENDIF (NOT _INCLUDED_FILE)

Index: FindFLEX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindFLEX.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** FindFLEX.cmake	1 Oct 2009 21:20:29 -0000	1.1.2.1
--- FindFLEX.cmake	9 Oct 2009 20:11:10 -0000	1.1.2.2
***************
*** 27,47 ****
  # respectively FLEX_TARGET and BISON_TARGET macros.
  #
! #====================================================================
! # Example:
  #
! #  find_package(BISON)
! #  find_package(FLEX)
  #
! #  BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp
! #  FLEX_TARGET(MyScanner lexer.l  ${CMAKE_CURRENT_BIANRY_DIR}/lexer.cpp)
! #  ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
  #
! #  include_directories(${CMAKE_CURRENT_BINARY_DIR})
! #  add_executable(Foo
! #     Foo.cc
! #     ${BISON_MyParser_OUTPUTS}
! #     ${FLEX_MyScanner_OUTPUTS}
! #  )
! #====================================================================

  #=============================================================================
--- 27,47 ----
  # respectively FLEX_TARGET and BISON_TARGET macros.
  #
! #  ====================================================================
! #  Example:
  #
! #   find_package(BISON)
! #   find_package(FLEX)
  #
! #   BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp
! #   FLEX_TARGET(MyScanner lexer.l  ${CMAKE_CURRENT_BIANRY_DIR}/lexer.cpp)
! #   ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
  #
! #   include_directories(${CMAKE_CURRENT_BINARY_DIR})
! #   add_executable(Foo
! #      Foo.cc
! #      ${BISON_MyParser_OUTPUTS}
! #      ${FLEX_MyScanner_OUTPUTS}
! #   )
! #  ====================================================================

  #=============================================================================

Index: CMakeParseImplicitLinkInfo.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeParseImplicitLinkInfo.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** CMakeParseImplicitLinkInfo.cmake	1 Oct 2009 21:20:21 -0000	1.3.2.1
--- CMakeParseImplicitLinkInfo.cmake	9 Oct 2009 20:11:10 -0000	1.3.2.2
***************
*** 17,23 ****
  # code.

! function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var)
    set(implicit_libs "")
    set(implicit_dirs_tmp)

    # Parse implicit linker arguments.
--- 17,24 ----
  # code.

! function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var log_var)
    set(implicit_libs "")
    set(implicit_dirs_tmp)
+   set(log "")

    # Parse implicit linker arguments.
***************
*** 26,30 ****
      get_filename_component(linker ${CMAKE_LINKER} NAME)
    endif()
!   set(linker_regex "^( *|.*/)(${linker}|ld|collect2)")
    string(REGEX REPLACE "\r?\n" ";" output_lines "${text}")
    foreach(line IN LISTS output_lines)
--- 27,34 ----
      get_filename_component(linker ${CMAKE_LINKER} NAME)
    endif()
!   # Construct a regex to match linker lines.  It must match both the
!   # whole line and just the command (argv[0]).
!   set(linker_regex "^( *|.*[/\\])(${linker}|ld|collect2)[^/\\]*( |$)")
!   set(log "${log}  link line regex: [${linker_regex}]\n")
    string(REGEX REPLACE "\r?\n" ";" output_lines "${text}")
    foreach(line IN LISTS output_lines)
***************
*** 39,42 ****
--- 43,47 ----
      endif()
      if("${cmd}" MATCHES "${linker_regex}")
+       set(log "${log}  link line: [${line}]\n")
        string(REGEX REPLACE ";-([LYz]);" ";-\\1" args "${args}")
        foreach(arg IN LISTS args)
***************
*** 45,55 ****
--- 50,63 ----
            string(REGEX REPLACE "^-L" "" dir "${arg}")
            list(APPEND implicit_dirs_tmp ${dir})
+           set(log "${log}    arg [${arg}] ==> dir [${dir}]\n")
          elseif("${arg}" MATCHES "^-l[^:]")
            # Unix library.
            string(REGEX REPLACE "^-l" "" lib "${arg}")
            list(APPEND implicit_libs ${lib})
+           set(log "${log}    arg [${arg}] ==> lib [${lib}]\n")
          elseif("${arg}" MATCHES "^(.:)?[/\\].*\\.a$")
            # Unix library full path.
            list(APPEND implicit_libs ${arg})
+           set(log "${log}    arg [${arg}] ==> lib [${arg}]\n")
          elseif("${arg}" MATCHES "^-Y(P,)?")
            # Sun search path.
***************
*** 57,74 ****
--- 65,91 ----
            string(REPLACE ":" ";" dirs "${dirs}")
            list(APPEND implicit_dirs_tmp ${dirs})
+           set(log "${log}    arg [${arg}] ==> dirs [${dirs}]\n")
          elseif("${arg}" MATCHES "^-l:")
            # HP named library.
            list(APPEND implicit_libs ${arg})
+           set(log "${log}    arg [${arg}] ==> lib [${arg}]\n")
          elseif("${arg}" MATCHES "^-z(all|default|weak)extract")
            # Link editor option.
            list(APPEND implicit_libs ${arg})
+           set(log "${log}    arg [${arg}] ==> opt [${arg}]\n")
+         else()
+           set(log "${log}    arg [${arg}] ==> ignore\n")
          endif()
        endforeach()
        break()
      elseif("${line}" MATCHES "LPATH(=| is:? )")
+       set(log "${log}  LPATH line: [${line}]\n")
        # HP search path.
        string(REGEX REPLACE ".*LPATH(=| is:? *)" "" paths "${line}")
        string(REPLACE ":" ";" paths "${paths}")
        list(APPEND implicit_dirs_tmp ${paths})
+       set(log "${log}    dirs [${paths}]\n")
+     else()
+       set(log "${log}  ignore line: [${line}]\n")
      endif()
    endforeach()
***************
*** 79,87 ****
--- 96,110 ----
      get_filename_component(dir "${d}" ABSOLUTE)
      list(APPEND implicit_dirs "${dir}")
+     set(log "${log}  collapse dir [${d}] ==> [${dir}]\n")
    endforeach()
    list(REMOVE_DUPLICATES implicit_dirs)

+   # Log results.
+   set(log "${log}  implicit libs: [${implicit_libs}]\n")
+   set(log "${log}  implicit dirs: [${implicit_dirs}]\n")
+ 
    # Return results.
    set(${lib_var} "${implicit_libs}" PARENT_SCOPE)
    set(${dir_var} "${implicit_dirs}" PARENT_SCOPE)
+   set(${log_var} "${log}" PARENT_SCOPE)
  endfunction()

Index: TestForANSIStreamHeaders.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/TestForANSIStreamHeaders.cmake,v
retrieving revision 1.11.16.1
retrieving revision 1.11.16.2
diff -C 2 -d -r1.11.16.1 -r1.11.16.2
*** TestForANSIStreamHeaders.cmake	1 Oct 2009 21:20:34 -0000	1.11.16.1
--- TestForANSIStreamHeaders.cmake	9 Oct 2009 20:11:11 -0000	1.11.16.2
***************
*** 1,4 ****
  # - Test for compiler support of ANSI stream headers iostream, etc.
! # check if we they have the standard ansi stream files (without the .h)
  #  CMAKE_NO_ANSI_STREAM_HEADERS - defined by the results
  #
--- 1,4 ----
  # - Test for compiler support of ANSI stream headers iostream, etc.
! # check if the compiler supports the standard ANSI iostream header (without the .h)
  #  CMAKE_NO_ANSI_STREAM_HEADERS - defined by the results
  #

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.166.2.1
retrieving revision 1.166.2.2
diff -C 2 -d -r1.166.2.1 -r1.166.2.2
*** FindQt4.cmake	1 Oct 2009 21:20:32 -0000	1.166.2.1
--- FindQt4.cmake	9 Oct 2009 20:11:11 -0000	1.166.2.2
***************
*** 15,18 ****
--- 15,26 ----
  #   target_link_libraries(myexe ${QT_LIBRARIES})
  #
+ # The minimum required version can be specified using the standard find_package()-syntax
+ # (see example above). 
+ # For compatibility with older versions of FindQt4.cmake it is also possible to
+ # set the variable QT_MIN_VERSION to the minimum required version of Qt4 before the 
+ # find_package(Qt4) command. 
+ # If both are used, the version used in the find_package() command overrides the
+ # one from QT_MIN_VERSION.
+ #
  # When using the components argument, QT_USE_QT* variables are automatically set
  # for the QT_USE_FILE to pick up.  If one wishes to manually set them, the
***************
*** 91,106 ****
  #        the name will be automatically determined from the name of the xml file
  #
! #  macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] )
  #        create a dbus adaptor (header and implementation file) from the xml file
  #        describing the interface, and add it to the list of sources. The adaptor
  #        forwards the calls to a parent class, defined in parentheader and named
  #        parentclassname. The name of the generated files will be
! #        <basename>adaptor.{cpp,h} where basename is the basename of the xml file.
  #
! #  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] )
  #        generate the xml interface file from the given header.
  #        If the optional argument interfacename is omitted, the name of the 
  #        interface file is constructed from the basename of the header with
  #        the suffix .xml appended.
  #
  #  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... 
--- 99,117 ----
  #        the name will be automatically determined from the name of the xml file
  #
! #  macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] [classname])
  #        create a dbus adaptor (header and implementation file) from the xml file
  #        describing the interface, and add it to the list of sources. The adaptor
  #        forwards the calls to a parent class, defined in parentheader and named
  #        parentclassname. The name of the generated files will be
! #        <basename>adaptor.{cpp,h} where basename defaults to the basename of the xml file.
! #        If <classname> is provided, then it will be used as the classname of the
! #        adaptor itself.
  #
! #  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] OPTIONS ...)
  #        generate the xml interface file from the given header.
  #        If the optional argument interfacename is omitted, the name of the 
  #        interface file is constructed from the basename of the header with
  #        the suffix .xml appended.
+ #        Options may be given to qdbuscpp2xml, such as those found when executing "qdbuscpp2xml --help"
  #
  #  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... 
***************
*** 163,166 ****
--- 174,180 ----
  #  QT_QTSCRIPTTOOLS_FOUND   True if QtScriptTools was found.
  #
+ #  QT_MAC_USE_COCOA    For Mac OS X, its whether Cocoa or Carbon is used.
+ #                      In general, this should not be used, but its useful
+ #                      when having platform specific code.
  #
  #  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
***************
*** 327,351 ****
  MACRO(QT_QUERY_QMAKE outvar invar)
    IF(QT_QMAKE_EXECUTABLE)
!   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
!     "message(CMAKE_MESSAGE<$$${invar}>)")

!   # Invoke qmake with the tmp.pro program to get the desired
!   # information.  Use the same variable for both stdout and stderr
!   # to make sure we get the output on all platforms.
!   EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
!     WORKING_DIRECTORY  
!     ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
!     OUTPUT_VARIABLE _qmake_query_output
!     RESULT_VARIABLE _qmake_result
!     ERROR_VARIABLE _qmake_query_output )
!   
!   FILE(REMOVE_RECURSE 
!     "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")

!   IF(_qmake_result)
!     MESSAGE(WARNING " querying qmake for ${invar}.  qmake reported:\n${_qmake_query_output}")
!   ELSE(_qmake_result)
!     STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
!   ENDIF(_qmake_result)

    ENDIF(QT_QMAKE_EXECUTABLE)
--- 341,365 ----
  MACRO(QT_QUERY_QMAKE outvar invar)
    IF(QT_QMAKE_EXECUTABLE)
!     FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
!          "message(CMAKE_MESSAGE<$$${invar}>)")

!     # Invoke qmake with the tmp.pro program to get the desired
!     # information.  Use the same variable for both stdout and stderr
!     # to make sure we get the output on all platforms.
!     EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
!       WORKING_DIRECTORY  
!       ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
!       OUTPUT_VARIABLE _qmake_query_output
!       RESULT_VARIABLE _qmake_result
!       ERROR_VARIABLE _qmake_query_output )

!     FILE(REMOVE_RECURSE 
!          "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
! 
!     IF(_qmake_result)
!       MESSAGE(WARNING " querying qmake for ${invar}.  qmake reported:\n${_qmake_query_output}")
!     ELSE(_qmake_result)
!       STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
!     ENDIF(_qmake_result)

    ENDIF(QT_QMAKE_EXECUTABLE)
***************
*** 407,421 ****
      STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")

!   # Suppport finding at least a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 )
!   # This implementation is a hack to avoid duplicating code and make sure we stay
!   # source-compatible with CMake 2.6.x
!   # For CMake 2.8, we should not set QT_MIN_VERSION but only use Qt4_FIND_VERSION_MAJOR,
!   # Qt4_FIND_VERSION_MINOR, etc
!   IF( Qt4_FIND_VERSION )
!     SET( QT_MIN_VERSION ${Qt4_FIND_VERSION} )
!     SET( req_qt_major_vers ${Qt4_FIND_VERSION_MAJOR} )
!     SET( req_qt_minor_vers ${Qt4_FIND_VERSION_MINOR} )
!     SET( req_qt_patch_vers ${Qt4_FIND_VERSION_PATCH} )
!   ENDIF( Qt4_FIND_VERSION )

      IF (NOT req_qt_major_vers EQUAL 4)
--- 421,433 ----
      STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")

!     # Suppport finding at least a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 )
!     # This implementation is a hack to avoid duplicating code and make sure we stay
!     # source-compatible with CMake 2.6.x
!     IF( Qt4_FIND_VERSION )
!       SET( QT_MIN_VERSION ${Qt4_FIND_VERSION} )
!       SET( req_qt_major_vers ${Qt4_FIND_VERSION_MAJOR} )
!       SET( req_qt_minor_vers ${Qt4_FIND_VERSION_MINOR} )
!       SET( req_qt_patch_vers ${Qt4_FIND_VERSION_PATCH} )
!     ENDIF( Qt4_FIND_VERSION )

      IF (NOT req_qt_major_vers EQUAL 4)
***************
*** 432,456 ****
      MATH(EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}")

!   # Support finding *exactly* a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 EXACT )
!   # The 'else' branch should be removed for CMake 2.8
!   IF( Qt4_FIND_VERSION_EXACT )
!     IF(found_vers EQUAL req_vers)
!       SET( QT4_QMAKE_FOUND TRUE )
!     ELSE(found_vers EQUAL req_vers)
!       SET( QT4_QMAKE_FOUND FALSE )
        IF (found_vers LESS req_vers)
          SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
        ELSE (found_vers LESS req_vers)
!         SET(QT4_INSTALLED_VERSION_TOO_NEW TRUE)
        ENDIF (found_vers LESS req_vers)
!     ENDIF(found_vers EQUAL req_vers)
!   ELSE( Qt4_FIND_VERSION_EXACT )
!     IF (found_vers LESS req_vers)
!       SET(QT4_QMAKE_FOUND FALSE)
!       SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
!     ELSE (found_vers LESS req_vers)
!       SET(QT4_QMAKE_FOUND TRUE)
!     ENDIF (found_vers LESS req_vers)
!   ENDIF( Qt4_FIND_VERSION_EXACT )
    ENDIF (qt_version_tmp)

--- 444,467 ----
      MATH(EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}")

!     # Support finding *exactly* a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 EXACT )
!     IF( Qt4_FIND_VERSION_EXACT )
!       IF(found_vers EQUAL req_vers)
!         SET( QT4_QMAKE_FOUND TRUE )
!       ELSE(found_vers EQUAL req_vers)
!         SET( QT4_QMAKE_FOUND FALSE )
!         IF (found_vers LESS req_vers)
!           SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
!         ELSE (found_vers LESS req_vers)
!           SET(QT4_INSTALLED_VERSION_TOO_NEW TRUE)
!         ENDIF (found_vers LESS req_vers)
!       ENDIF(found_vers EQUAL req_vers)
!     ELSE( Qt4_FIND_VERSION_EXACT )
        IF (found_vers LESS req_vers)
+         SET(QT4_QMAKE_FOUND FALSE)
          SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
        ELSE (found_vers LESS req_vers)
!         SET(QT4_QMAKE_FOUND TRUE)
        ENDIF (found_vers LESS req_vers)
!     ENDIF( Qt4_FIND_VERSION_EXACT )
    ENDIF (qt_version_tmp)

***************
*** 488,492 ****

    # ask qmake for the binary dir
!   IF ((QT_LIBRARY_DIR AND NOT QT_BINARY_DIR) OR QT_QMAKE_CHANGED)
       EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
         ARGS "-query QT_INSTALL_BINS"
--- 499,503 ----

    # ask qmake for the binary dir
!   IF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR  OR  QT_QMAKE_CHANGED)
       EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
         ARGS "-query QT_INSTALL_BINS"
***************
*** 495,502 ****
       FILE(TO_CMAKE_PATH "${qt_bins}" qt_bins)
       SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "" FORCE)
!   ENDIF ((QT_LIBRARY_DIR AND NOT QT_BINARY_DIR) OR QT_QMAKE_CHANGED)

    # ask qmake for the include dir
!   IF ((QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR) OR QT_QMAKE_CHANGED)
        EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
          ARGS "-query QT_INSTALL_HEADERS" 
--- 506,513 ----
       FILE(TO_CMAKE_PATH "${qt_bins}" qt_bins)
       SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "" FORCE)
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR  OR  QT_QMAKE_CHANGED)

    # ask qmake for the include dir
!   IF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR  OR  QT_QMAKE_CHANGED)
        EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
          ARGS "-query QT_INSTALL_HEADERS" 
***************
*** 505,513 ****
        FILE(TO_CMAKE_PATH "${qt_headers}" qt_headers)
        SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "" FORCE)
!   ENDIF ((QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR) OR QT_QMAKE_CHANGED)

    # ask qmake for the documentation directory
!   IF ((QT_LIBRARY_DIR AND NOT QT_DOC_DIR) OR QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_DOCS"
--- 516,524 ----
        FILE(TO_CMAKE_PATH "${qt_headers}" qt_headers)
        SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "" FORCE)
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR  OR  QT_QMAKE_CHANGED)

    # ask qmake for the documentation directory
!   IF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR  OR  QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_DOCS"
***************
*** 516,523 ****
      FILE(TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir)
      SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs" FORCE)
!   ENDIF ((QT_LIBRARY_DIR AND NOT QT_DOC_DIR) OR QT_QMAKE_CHANGED)

    # ask qmake for the mkspecs directory
!   IF ((QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR) OR QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QMAKE_MKSPECS"
--- 527,534 ----
      FILE(TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir)
      SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs" FORCE)
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR  OR  QT_QMAKE_CHANGED)

    # ask qmake for the mkspecs directory
!   IF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR  OR  QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QMAKE_MKSPECS"
***************
*** 532,539 ****
        DOC "The location of the Qt mkspecs containing qconfig.pri"
        NO_DEFAULT_PATH )
!   ENDIF ((QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR) OR QT_QMAKE_CHANGED)

    # ask qmake for the plugins directory
!   IF ((QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR) OR QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_PLUGINS"
--- 543,550 ----
        DOC "The location of the Qt mkspecs containing qconfig.pri"
        NO_DEFAULT_PATH )
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR  OR  QT_QMAKE_CHANGED)

    # ask qmake for the plugins directory
!   IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_PLUGINS"
***************
*** 542,549 ****
      FILE(TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir)
      SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
!   ENDIF ((QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR) OR QT_QMAKE_CHANGED)

    # ask qmake for the translations directory
!   IF ((QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR) OR QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_TRANSLATIONS"
--- 553,560 ----
      FILE(TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir)
      SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)

    # ask qmake for the translations directory
!   IF (QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR  OR  QT_QMAKE_CHANGED)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_TRANSLATIONS"
***************
*** 552,556 ****
      FILE(TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir)
      SET(QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH "The location of the Qt translations" FORCE)
!   ENDIF ((QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR) OR QT_QMAKE_CHANGED)

    ########################################
--- 563,567 ----
      FILE(TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir)
      SET(QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH "The location of the Qt translations" FORCE)
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR  OR  QT_QMAKE_CHANGED)

    ########################################
***************
*** 658,662 ****
      ENDIF(Qt4_FIND_REQUIRED)
    ENDIF( NOT QT_INCLUDE_DIR)
!   
    # Make variables changeble to the advanced user
    MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR
--- 669,673 ----
      ENDIF(Qt4_FIND_REQUIRED)
    ENDIF( NOT QT_INCLUDE_DIR)
! 
    # Make variables changeble to the advanced user
    MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR
***************
*** 725,731 ****
    ENDIF("${QT_EDITION}" MATCHES "DesktopLight")

-   

!   
    # find the libraries
    FOREACH(QT_MODULE ${QT_MODULES})
--- 736,742 ----
    ENDIF("${QT_EDITION}" MATCHES "DesktopLight")

! 
! 
    # find the libraries
    FOREACH(QT_MODULE ${QT_MODULES})
***************
*** 866,873 ****
    _QT4_ADJUST_LIB_VARS(PHONON)
    _QT4_ADJUST_LIB_VARS(QTCLUCENE)
-   _QT4_ADJUST_LIB_VARS(QTMOTIF)
    _QT4_ADJUST_LIB_VARS(QTSCRIPTTOOLS)

    # platform dependent libraries
    IF(WIN32)
      _QT4_ADJUST_LIB_VARS(QTMAIN)
--- 877,887 ----
    _QT4_ADJUST_LIB_VARS(PHONON)
    _QT4_ADJUST_LIB_VARS(QTCLUCENE)
    _QT4_ADJUST_LIB_VARS(QTSCRIPTTOOLS)
+  

    # platform dependent libraries
+   IF(Q_WS_X11)
+     _QT4_ADJUST_LIB_VARS(QTMOTIF)
+   ENDIF(Q_WS_X11)
    IF(WIN32)
      _QT4_ADJUST_LIB_VARS(QTMAIN)
***************
*** 1019,1023 ****

       FOREACH(_current ${_inc_DIRS})
!         SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
       ENDFOREACH(_current ${_inc_DIRS})

--- 1033,1042 ----

       FOREACH(_current ${_inc_DIRS})
!         IF("${_current}" MATCHES ".framework/?$")
!           STRING(REGEX REPLACE "/[^/]+.framework" "" framework_path "${_current}")
!           SET(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
!         ELSE("${_current}" MATCHES ".framework/?$")
!           SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
!         ENDIF("${_current}" MATCHES ".framework/?$")
       ENDFOREACH(_current ${_inc_DIRS})

***************
*** 1068,1071 ****
--- 1087,1091 ----

    MACRO (QT4_GENERATE_MOC infile outfile )
+   # get include dirs and flags
       QT4_GET_MOC_FLAGS(moc_flags)
       GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
***************
*** 1175,1180 ****

!   MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
!     SET(_customName "${ARGV1}")
      GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
      GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
--- 1195,1201 ----

!   MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options )
!     QT4_EXTRACT_OPTIONS(_customName _qt4_dbus_options ${ARGN})
! 
      GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
      GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
***************
*** 1187,1191 ****

      ADD_CUSTOM_COMMAND(OUTPUT ${_target}
!         COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} -o ${_target} ${_in_file}
          DEPENDS ${_in_file}
      )
--- 1208,1212 ----

      ADD_CUSTOM_COMMAND(OUTPUT ${_target}
!         COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} -o ${_target}
          DEPENDS ${_in_file}
      )
***************
*** 1193,1197 ****

!   MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename )
      GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)

--- 1214,1218 ----

!   MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
      GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)

***************
*** 1254,1257 ****
--- 1275,1279 ----
                 FOREACH (_current_MOC_INC ${_match})
                    STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+ 
                    GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
                    IF(EXISTS ${_abs_PATH}/${_basename}.hpp)
***************
*** 1344,1348 ****
      SET( QT4_FOUND "YES" )
      INCLUDE(FindPackageMessage)
!     FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION}"
        "[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
    ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
--- 1366,1370 ----
      SET( QT4_FOUND "YES" )
      INCLUDE(FindPackageMessage)
!     FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE})"
        "[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
    ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
***************
*** 1498,1507 ****

    ## openssl
!   IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
!     FIND_PACKAGE(OpenSSL)
!     IF(OPENSSL_LIBRARIES)
!       SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
!     ENDIF(OPENSSL_LIBRARIES)
!   ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)

    ## dbus
--- 1520,1538 ----

    ## openssl
!   IF(NOT Q_WS_WIN)
!     SET(_QT_NEED_OPENSSL 0)
!     IF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
!       SET(_QT_NEED_OPENSSL 1)
!     ENDIF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
!     IF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
!       SET(_QT_NEED_OPENSSL 1)
!     ENDIF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
!     IF(_QT_NEED_OPENSSL)
!       FIND_PACKAGE(OpenSSL)
!       IF(OPENSSL_LIBRARIES)
!         SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
!       ENDIF(OPENSSL_LIBRARIES)
!     ENDIF(_QT_NEED_OPENSSL)
!   ENDIF(NOT Q_WS_WIN)

    ## dbus

Index: CMakeDetermineSystem.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineSystem.cmake,v
retrieving revision 1.28.4.1
retrieving revision 1.28.4.2
diff -C 2 -d -r1.28.4.1 -r1.28.4.2
*** CMakeDetermineSystem.cmake	1 Oct 2009 21:20:18 -0000	1.28.4.1
--- CMakeDetermineSystem.cmake	9 Oct 2009 20:11:10 -0000	1.28.4.2
***************
*** 26,29 ****
--- 26,30 ----
  # IRIX                          IRIX  
  # Linux                         Linux  
+ # GNU/kFreeBSD                  GNU/kFreeBSD
  # NetBSD                        NetBSD  
  # OpenBSD                       OpenBSD  
***************
*** 122,125 ****
--- 123,131 ----
    ENDIF(${_PREFIX}_NAME MATCHES BSD.OS)

+   # fix for GNU/kFreeBSD, remove the GNU/
+   IF(${_PREFIX}_NAME MATCHES kFreeBSD)
+     SET(${_PREFIX}_NAME kFreeBSD)
+   ENDIF(${_PREFIX}_NAME MATCHES kFreeBSD)
+ 
    # fix for CYGWIN which has windows version in it 
    IF(${_PREFIX}_NAME MATCHES CYGWIN)

Index: TestForSSTREAM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/TestForSSTREAM.cmake,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C 2 -d -r1.3.4.1 -r1.3.4.2
*** TestForSSTREAM.cmake	1 Oct 2009 21:20:34 -0000	1.3.4.1
--- TestForSSTREAM.cmake	9 Oct 2009 20:11:11 -0000	1.3.4.2
***************
*** 1,4 ****
! # # - Test for std:: namespace support
! # check if the compiler supports std:: on stl classes
  #  CMAKE_NO_ANSI_STRING_STREAM - defined by the results
  #
--- 1,4 ----
! # - Test for compiler support of ANSI sstream header
! # check if the compiler supports the standard ANSI sstream header
  #  CMAKE_NO_ANSI_STRING_STREAM - defined by the results
  #

Index: CPack.RuntimeScript.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.RuntimeScript.in,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C 2 -d -r1.5 -r1.5.2.1
*** CPack.RuntimeScript.in	21 Jan 2009 16:54:29 -0000	1.5
--- CPack.RuntimeScript.in	9 Oct 2009 20:11:10 -0000	1.5.2.1
***************
*** 4,11 ****

  CWD="`dirname \"$0\"`"
! TMP=/tmp/$UID/TemporaryItems

  version=`sw_vers -productVersion`
! if [ "$?" == "0" ]; then
    major=${version%%\.*}
    rest=${version#*\.}
--- 4,11 ----

  CWD="`dirname \"$0\"`"
! TMP=/tmp/$(id -ru)/TemporaryItems

  version=`sw_vers -productVersion`
! if [ "$?" = "0" ]; then
    major=${version%%\.*}
    rest=${version#*\.}
***************
*** 25,29 ****

  # if 10.5 or greater, then all the open-x11 stuff need not occur
! if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
  version=`sw_vers -productVersion`
  if [ "$?" = "0" ]; then
--- 25,29 ----

  # if 10.5 or greater, then all the open-x11 stuff need not occur
! if [ "$major" -lt 10 ] || ([ "$major" -eq 10 ] && [ "$minor" -lt 5 ]); then
  version=`sw_vers -productVersion`
  if [ "$?" = "0" ]; then
***************
*** 45,49 ****

  # if 10.5 or greater, then all the open-x11 stuff need not occur
! if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
  ps -wx -ocommand | grep -e '[X]11.app' > /dev/null
  if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
--- 45,49 ----

  # if 10.5 or greater, then all the open-x11 stuff need not occur
! if [ "$major" -lt 10 ] || ([ "$major" -eq 10 ] && [ "$minor" -lt 5 ]); then
  ps -wx -ocommand | grep -e '[X]11.app' > /dev/null
  if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then

Index: FindBISON.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBISON.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** FindBISON.cmake	1 Oct 2009 21:20:23 -0000	1.1.2.1
--- FindBISON.cmake	9 Oct 2009 20:11:10 -0000	1.1.2.2
***************
*** 23,33 ****
  #  BISON_${Name}_COMPILE_FLAGS - Options used in the bison command line
  #
! #====================================================================
! # Example:
  #
! # find_package(BISON)
! # BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp)
! # add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS})
! #====================================================================

  #=============================================================================
--- 23,33 ----
  #  BISON_${Name}_COMPILE_FLAGS - Options used in the bison command line
  #
! #  ====================================================================
! #  Example:
  #
! #   find_package(BISON)
! #   BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp)
! #   add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS})
! #  ====================================================================

  #=============================================================================

Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C 2 -d -r1.23.2.1 -r1.23.2.2
*** CMakeFortranInformation.cmake	1 Oct 2009 21:20:20 -0000	1.23.2.1
--- CMakeFortranInformation.cmake	9 Oct 2009 20:11:10 -0000	1.23.2.2
***************
*** 29,39 ****
  ENDIF(CMAKE_COMPILER_IS_GNUG77)
  IF(CMAKE_Fortran_COMPILER_ID)
!   IF(EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake)
!     SET(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER_ID}-Fortran)
!   ENDIF(EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake)
  ENDIF(CMAKE_Fortran_COMPILER_ID)
! SET(CMAKE_SYSTEM_AND_Fortran_COMPILER_INFO_FILE
!   ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
! INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)

  # This should be included before the _INIT variables are
--- 29,46 ----
  ENDIF(CMAKE_COMPILER_IS_GNUG77)
  IF(CMAKE_Fortran_COMPILER_ID)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
  ENDIF(CMAKE_Fortran_COMPILER_ID)
! IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL
!           RESULT_VARIABLE _INCLUDED_FILE)
! ENDIF (NOT _INCLUDED_FILE)
! # We specify the compiler information in the system file for some
! # platforms, but this language may not have been enabled when the file
! # was first included.  Include it again to get the language info.
! # Remove this when all compiler info is removed from system files.
! IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
! ENDIF (NOT _INCLUDED_FILE)
! 

  # This should be included before the _INIT variables are

Index: FindVTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindVTK.cmake,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -C 2 -d -r1.30.2.1 -r1.30.2.2
*** FindVTK.cmake	1 Oct 2009 21:20:33 -0000	1.30.2.1
--- FindVTK.cmake	9 Oct 2009 20:11:11 -0000	1.30.2.2
***************
*** 41,70 ****
  #  License text for the above reference.)

  # Construct consitent error messages for use below.
! SET(VTK_DIR_DESCRIPTION "directory containing VTKConfig.cmake.  This is either the root of the build tree, or PREFIX/lib/vtk for an installation.  For VTK 4.0, this is the location of UseVTK.cmake.  This is either the root of the build tree or PREFIX/include/vtk for an installation.")
  SET(VTK_DIR_MESSAGE "VTK not found.  Set the VTK_DIR cmake cache entry to the ${VTK_DIR_DESCRIPTION}")

! # Search only if the location is not already known.
! IF(NOT VTK_DIR)
!   # Get the system search path as a list.
!   IF(UNIX)
!     STRING(REGEX MATCHALL "[^:]+" VTK_DIR_SEARCH1 "$ENV{PATH}")
!   ELSE(UNIX)
!     STRING(REGEX REPLACE "\\\\" "/" VTK_DIR_SEARCH1 "$ENV{PATH}")
!   ENDIF(UNIX)
!   STRING(REGEX REPLACE "/;" ";" VTK_DIR_SEARCH2 "${VTK_DIR_SEARCH1}")

!   # Construct a set of paths relative to the system search path.
!   SET(VTK_DIR_SEARCH "")
!   FOREACH(dir ${VTK_DIR_SEARCH2})
!     SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
!       ${dir}/../lib/vtk-5.4
!       ${dir}/../lib/vtk-5.2
!       ${dir}/../lib/vtk-5.1
!       ${dir}/../lib/vtk-5.0
!       ${dir}/../lib/vtk
!       )
!   ENDFOREACH(dir)

    # Old scripts may set these directories in the CMakeCache.txt file.
    # They can tell us where to find VTKConfig.cmake.
--- 41,79 ----
  #  License text for the above reference.)

+ # Assume not found.
+ SET(VTK_FOUND 0)
+ 
+ # VTK 4.0 did not provide VTKConfig.cmake.
+ IF("${VTK_FIND_VERSION}" VERSION_LESS 4.1)
+   SET(_VTK_40_ALLOW 1)
+   IF(VTK_FIND_VERSION)
+     SET(_VTK_40_ONLY 1)
+   ENDIF()
+ ENDIF()
+ 
  # Construct consitent error messages for use below.
! SET(VTK_DIR_DESCRIPTION "directory containing VTKConfig.cmake.  This is either the root of the build tree, or PREFIX/lib/vtk for an installation.")
! IF(_VTK_40_ALLOW)
!   SET(VTK_DIR_DESCRIPTION "${VTK_DIR_DESCRIPTION}  For VTK 4.0, this is the location of UseVTK.cmake.  This is either the root of the build tree or PREFIX/include/vtk for an installation.")
! ENDIF()
  SET(VTK_DIR_MESSAGE "VTK not found.  Set the VTK_DIR cmake cache entry to the ${VTK_DIR_DESCRIPTION}")

! # Check whether VTK 4.0 has already been found.
! IF(_VTK_40_ALLOW AND VTK_DIR)
!   IF(EXISTS ${VTK_DIR}/UseVTK.cmake AND NOT EXISTS ${VTK_DIR}/VTKConfig.cmake)
!     SET(VTK_FOUND 1)
!     INCLUDE(UseVTKConfig40) # No VTKConfig; load VTK 4.0 settings.
!   ENDIF()
! ENDIF()

! # Use the Config mode of the find_package() command to find VTKConfig.
! # If this succeeds (possibly because VTK_DIR is already set), the
! # command will have already loaded VTKConfig.cmake and set VTK_FOUND.
! IF(NOT _VTK_40_ONLY AND NOT VTK_FOUND)
!   FIND_PACKAGE(VTK QUIET NO_MODULE)
! ENDIF()

+ # Special search for VTK 4.0.
+ IF(_VTK_40_ALLOW AND NOT VTK_DIR)
    # Old scripts may set these directories in the CMakeCache.txt file.
    # They can tell us where to find VTKConfig.cmake.
***************
*** 78,97 ****
    ENDIF(VTK_INSTALL_PATH AND USE_INSTALLED_VTK)

!   #
!   # Look for an installation or build tree.
!   #
!   FIND_PATH(VTK_DIR UseVTK.cmake
!     # Support legacy cache files.
!     ${VTK_DIR_SEARCH_LEGACY}
! 
!     # Look for an environment variable VTK_DIR.
!     $ENV{VTK_DIR}

!     # Look in places relative to the system executable search path.
!     ${VTK_DIR_SEARCH}

!     # Look in standard UNIX install locations.
!     /usr/local/lib/vtk
!     /usr/lib/vtk

      # Read from the CMakeSetup registry entries.  It is likely that
--- 87,100 ----
    ENDIF(VTK_INSTALL_PATH AND USE_INSTALLED_VTK)

!   # Look for UseVTK.cmake in build trees or under <prefix>/include/vtk.
!   FIND_PATH(VTK_DIR
!     NAMES UseVTK.cmake
!     PATH_SUFFIXES vtk-4.0 vtk
!     HINTS $ENV{VTK_DIR}

!     PATHS

!     # Support legacy cache files.
!     ${VTK_DIR_SEARCH_LEGACY}

      # Read from the CMakeSetup registry entries.  It is likely that
***************
*** 110,141 ****
      # Help the user find it if we cannot.
      DOC "The ${VTK_DIR_DESCRIPTION}"
!   )
! ENDIF(NOT VTK_DIR)
! 
! # If VTK was found, load the configuration file to get the rest of the
! # settings.
! IF(VTK_DIR)
!   # Make sure the VTKConfig.cmake file exists in the directory provided.
!   IF(EXISTS ${VTK_DIR}/VTKConfig.cmake)
! 
!     # We found VTK.  Load the settings.
!     SET(VTK_FOUND 1)
!     INCLUDE(${VTK_DIR}/VTKConfig.cmake)

!   ELSE(EXISTS ${VTK_DIR}/VTKConfig.cmake)
!     IF(EXISTS ${VTK_DIR}/UseVTK.cmake)
!       # We found VTK 4.0 (UseVTK.cmake exists, but not VTKConfig.cmake).
        SET(VTK_FOUND 1)
!       # Load settings for VTK 4.0.
!       INCLUDE(UseVTKConfig40)
!     ELSE(EXISTS ${VTK_DIR}/UseVTK.cmake)
!       # We did not find VTK.
!       SET(VTK_FOUND 0)
!     ENDIF(EXISTS ${VTK_DIR}/UseVTK.cmake)
!   ENDIF(EXISTS ${VTK_DIR}/VTKConfig.cmake)
! ELSE(VTK_DIR)
!   # We did not find VTK.
!   SET(VTK_FOUND 0)
! ENDIF(VTK_DIR)

  #-----------------------------------------------------------------------------
--- 113,128 ----
      # Help the user find it if we cannot.
      DOC "The ${VTK_DIR_DESCRIPTION}"
!     )

!   IF(VTK_DIR)
!     IF(EXISTS ${VTK_DIR}/UseVTK.cmake AND NOT EXISTS ${VTK_DIR}/VTKConfig.cmake)
        SET(VTK_FOUND 1)
!       INCLUDE(UseVTKConfig40) # No VTKConfig; load VTK 4.0 settings.
!     ELSE()
!       # We found the wrong version.  Pretend we did not find it.
!       SET(VTK_DIR "VTK_DIR-NOTFOUND" CACHE PATH "The ${VTK_DIR_DESCRIPTION}" FORCE)
!     ENDIF()
!   ENDIF()
! ENDIF()

  #-----------------------------------------------------------------------------

Index: TestForANSIForScope.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/TestForANSIForScope.cmake,v
retrieving revision 1.15.4.1
retrieving revision 1.15.4.2
diff -C 2 -d -r1.15.4.1 -r1.15.4.2
*** TestForANSIForScope.cmake	1 Oct 2009 21:20:34 -0000	1.15.4.1
--- TestForANSIForScope.cmake	9 Oct 2009 20:11:11 -0000	1.15.4.2
***************
*** 1,4 ****
  # - Check for ANSI for scope support
! # Check if the compiler supports std:: on stl classes.
  #  CMAKE_NO_ANSI_FOR_SCOPE - holds result
  #
--- 1,4 ----
  # - Check for ANSI for scope support
! # Check if the compiler restricts the scope of variables declared in a for-init-statement to the loop body.
  #  CMAKE_NO_ANSI_FOR_SCOPE - holds result
  #

Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -C 2 -d -r1.28.2.1 -r1.28.2.2
*** CMakeCXXInformation.cmake	1 Oct 2009 21:20:17 -0000	1.28.2.1
--- CMakeCXXInformation.cmake	9 Oct 2009 20:11:10 -0000	1.28.2.2
***************
*** 55,59 ****
  ENDIF(CMAKE_CXX_COMPILER_ID)
  IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
  ENDIF (NOT _INCLUDED_FILE)

--- 55,67 ----
  ENDIF(CMAKE_CXX_COMPILER_ID)
  IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL
!           RESULT_VARIABLE _INCLUDED_FILE)
! ENDIF (NOT _INCLUDED_FILE)
! # We specify the compiler information in the system file for some
! # platforms, but this language may not have been enabled when the file
! # was first included.  Include it again to get the language info.
! # Remove this when all compiler info is removed from system files.
! IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
  ENDIF (NOT _INCLUDED_FILE)

Index: FindProtobuf.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindProtobuf.cmake,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C 2 -d -r1.4.2.1 -r1.4.2.2
*** FindProtobuf.cmake	1 Oct 2009 21:20:32 -0000	1.4.2.1
--- FindProtobuf.cmake	9 Oct 2009 20:11:10 -0000	1.4.2.2
***************
*** 12,29 ****
  #   PROTOBUF_PROTOC_EXECUTABLE - The protoc compiler
  #
! #====================================================================
! # Example:
  #
! # find_package(Protobuf REQUIRED)
! # include_directories(${PROTOBUF_INCLUDE_DIRS})
  #
! # include_directories(${CMAKE_CURRENT_BINARY_DIR})
! # PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto)
! # add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS})
! # target_link_libraries(bar ${PROTOBUF_LIBRARY})
  #
  # NOTE: You may need to link against pthreads, depending
  # on the platform.
! #====================================================================
  #
  # PROTOBUF_GENERATE_CPP (public function)
--- 12,29 ----
  #   PROTOBUF_PROTOC_EXECUTABLE - The protoc compiler
  #
! #  ====================================================================
! #  Example:
  #
! #   find_package(Protobuf REQUIRED)
! #   include_directories(${PROTOBUF_INCLUDE_DIRS})
  #
! #   include_directories(${CMAKE_CURRENT_BINARY_DIR})
! #   PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto)
! #   add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS})
! #   target_link_libraries(bar ${PROTOBUF_LIBRARY})
  #
  # NOTE: You may need to link against pthreads, depending
  # on the platform.
! #  ====================================================================
  #
  # PROTOBUF_GENERATE_CPP (public function)
***************
*** 34,38 ****
  #   ARGN = proto files
  #
! #====================================================================

--- 34,38 ----
  #   ARGN = proto files
  #
! #  ====================================================================

Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C 2 -d -r1.20.2.1 -r1.20.2.2
*** FindQt3.cmake	1 Oct 2009 21:20:32 -0000	1.20.2.1
--- FindQt3.cmake	9 Oct 2009 20:11:10 -0000	1.20.2.2
***************
*** 139,143 ****
  # qt 3 should prefer QTDIR over the PATH
  FIND_PROGRAM(QT_MOC_EXECUTABLE
!   NAMES moc moc-qt3
    HINTS
    $ENV{QTDIR}/bin
--- 139,143 ----
  # qt 3 should prefer QTDIR over the PATH
  FIND_PROGRAM(QT_MOC_EXECUTABLE
!   NAMES moc-qt3 moc
    HINTS
    $ENV{QTDIR}/bin
***************
*** 161,165 ****

  # qt 3 should prefer QTDIR over the PATH
! FIND_PROGRAM(QT_UIC_EXECUTABLE uic
    HINTS
    $ENV{QTDIR}/bin
--- 161,166 ----

  # qt 3 should prefer QTDIR over the PATH
! FIND_PROGRAM(QT_UIC_EXECUTABLE
!   NAMES uic-qt3 uic
    HINTS
    $ENV{QTDIR}/bin

Index: CMakeDetermineCompilerABI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerABI.cmake,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C 2 -d -r1.5.2.1 -r1.5.2.2
*** CMakeDetermineCompilerABI.cmake	1 Oct 2009 21:20:18 -0000	1.5.2.1
--- CMakeDetermineCompilerABI.cmake	9 Oct 2009 20:11:10 -0000	1.5.2.2
***************
*** 67,71 ****
            # Skip this with Xcode for now.
            AND NOT "${CMAKE_GENERATOR}" MATCHES Xcode)
!         CMAKE_PARSE_IMPLICIT_LINK_INFO("${OUTPUT}" implicit_libs implicit_dirs)
        ENDIF()
        SET(CMAKE_${lang}_IMPLICIT_LINK_LIBRARIES "${implicit_libs}" PARENT_SCOPE)
--- 67,73 ----
            # Skip this with Xcode for now.
            AND NOT "${CMAKE_GENERATOR}" MATCHES Xcode)
!         CMAKE_PARSE_IMPLICIT_LINK_INFO("${OUTPUT}" implicit_libs implicit_dirs log)
!         FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
!           "Parsed ${lang} implicit link information from above output:\n${log}\n\n")
        ENDIF()
        SET(CMAKE_${lang}_IMPLICIT_LINK_LIBRARIES "${implicit_libs}" PARENT_SCOPE)

Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -C 2 -d -r1.45.2.1 -r1.45.2.2
*** FindBoost.cmake	1 Oct 2009 21:20:23 -0000	1.45.2.1
--- FindBoost.cmake	9 Oct 2009 20:11:10 -0000	1.45.2.2
***************
*** 2,5 ****
--- 2,10 ----
  # Usage of this module as follows:
  #
+ # NOTE: Take note of the Boost_ADDITIONAL_VERSIONS variable below.
+ # Due to Boost naming conventions and limitations in CMake this find
+ # module is NOT future safe with respect to Boost version numbers,
+ # and may break.
+ #
  # == Using Header-Only libraries from within Boost: ==
  #
***************
*** 66,70 ****
  # binary Boost releases do so.
  #
! # SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
  #
  # ===================================== ============= ========================
--- 71,75 ----
  # binary Boost releases do so.
  #
! # SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
  #
  # ===================================== ============= ========================
***************
*** 91,94 ****
--- 96,105 ----
  #                                Please enable this before filing any bug
  #                                reports.
+ #
+ #   Boost_DETAILED_FAILURE_MSG   FindBoost doesn't output detailed information
+ #                                about why it failed or how to fix the problem
+ #                                unless this is set to TRUE or the REQUIRED
+ #                                keyword is specified in find_package().
+ #                                  [Since CMake 2.8.0]
  # 
  #   Boost_COMPILER               Set this to the compiler suffix used by Boost
***************
*** 155,158 ****
--- 166,170 ----
  # Copyright 2007      Mike Jackson
  # Copyright 2008      Andreas Pakulat <apaku at gmx.de>
+ # Copyright 2008-2009 Philip Lowman <philip at yhbt.com>
  #
  # Distributed under the OSI-approved BSD License (the "License");
***************
*** 548,553 ****
      # please report them and use the Boost_COMPILER variable
      # to work around the problems.
!     if("${CMAKE_CXX_COMPILER}" MATCHES "icl" 
!         OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc") 
        if(WIN32)
          set (_boost_COMPILER "-iw")
--- 560,566 ----
      # please report them and use the Boost_COMPILER variable
      # to work around the problems.
!     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"
!         OR "${CMAKE_CXX_COMPILER}" MATCHES "icl" 
!         OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
        if(WIN32)
          set (_boost_COMPILER "-iw")
***************
*** 875,883 ****
          ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
        ENDFOREACH(COMPONENT)
!   ELSE (Boost_FOUND)
!       IF (Boost_FIND_REQUIRED)
!         message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
!       ENDIF(Boost_FIND_REQUIRED)
!   ENDIF(Boost_FOUND)

    # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
--- 888,908 ----
          ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
        ENDFOREACH(COMPONENT)
!   else()
!     if(Boost_FIND_REQUIRED)
!       message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
!     else()
!       if(NOT Boost_FIND_QUIETLY)
!         # we opt not to automatically output Boost_ERROR_REASON here as
!         # it could be quite lengthy and somewhat imposing in it's requests
!         # Since Boost is not always a required dependency we'll leave this
!         # up to the end-user.
!         if(Boost_DEBUG OR Boost_DETAILED_FAILURE_MSG)
!           message(STATUS "Could NOT find Boost\n${Boost_ERROR_REASON}")
!         else()
!           message(STATUS "Could NOT find Boost")
!         endif()
!       endif()
!     endif(Boost_FIND_REQUIRED)
!   endif()

    # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view

Index: FindCUDA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCUDA.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindCUDA.cmake	1 Oct 2009 21:20:23 -0000	1.2.2.1
--- FindCUDA.cmake	9 Oct 2009 20:11:10 -0000	1.2.2.2
***************
*** 223,228 ****
  #  Abe Stephens, SCI Institute -- http://www.sci.utah.edu/~abe/FindCuda.html
  #
! #  Copyright (c) 2008-2009
! #  NVIDIA Corp.
  #
  #  Copyright (c) 2007-2009
--- 223,227 ----
  #  Abe Stephens, SCI Institute -- http://www.sci.utah.edu/~abe/FindCuda.html
  #
! #  Copyright (c) 2008 - 2009 NVIDIA Corporation.  All rights reserved.
  #
  #  Copyright (c) 2007-2009
***************
*** 1029,1032 ****
--- 1028,1033 ----
          DEPENDS ${CUDA_NVCC_DEPEND}
          DEPENDS ${custom_target_script}
+         # Make sure the output directory exists before trying to write to it.
+         COMMAND ${CMAKE_COMMAND} -E make_directory "${generated_file_path}"
          COMMAND ${CMAKE_COMMAND} ARGS
            -D verbose:BOOL=${verbose_output}