[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.24 1.25

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities
In directory public:/mounts/ram/cvs-serv16840/Utilities

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Fix cmake-gui docs generation PATH feature

Automatic addition of the Qt DLL location to PATH can be done only for
generators that use a Windows shell.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeLists.txt	24 Feb 2009 14:00:42 -0000	1.24
--- CMakeLists.txt	24 Feb 2009 22:07:04 -0000	1.25
***************
*** 33,37 ****
  
  # Help cmake-gui find the Qt DLLs on Windows.
! IF(BUILD_QtDialog AND WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
    GET_FILENAME_COMPONENT(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
    IF(EXISTS "${Qt_BIN_DIR}/QtCore4.dll")
--- 33,39 ----
  
  # Help cmake-gui find the Qt DLLs on Windows.
! SET(WIN_SHELL_GENS "Visual Studio|NMake|MinGW|Watcom|Borland")
! IF(BUILD_QtDialog AND "${CMAKE_GENERATOR}" MATCHES "${WIN_SHELL_GENS}"
!     AND EXISTS "${QT_QMAKE_EXECUTABLE}" AND NOT CMAKE_NO_AUTO_QT_ENV)
    GET_FILENAME_COMPONENT(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
    IF(EXISTS "${Qt_BIN_DIR}/QtCore4.dll")
***************
*** 40,44 ****
      SET(cmake-gui-PATH COMMAND set "${_PATH}")
    ENDIF(EXISTS "${Qt_BIN_DIR}/QtCore4.dll")
! ENDIF(BUILD_QtDialog AND WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
  
  # add the docs for the executables
--- 42,47 ----
      SET(cmake-gui-PATH COMMAND set "${_PATH}")
    ENDIF(EXISTS "${Qt_BIN_DIR}/QtCore4.dll")
! ENDIF(BUILD_QtDialog AND "${CMAKE_GENERATOR}" MATCHES "${WIN_SHELL_GENS}"
!   AND EXISTS "${QT_QMAKE_EXECUTABLE}" AND NOT CMAKE_NO_AUTO_QT_ENV)
  
  # add the docs for the executables