[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.20 1.21

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv4448/Source/QtDialog

Modified Files:
	CMakeLists.txt 
Log Message:
COMP: Fix installation of cmake-gui by CMake 2.4

When CMake 2.4 generates the build tree for CMake itself it asks the
built CMake to install itself using the rules that 2.4 generated.  Since
the install rules use undocumented commands that are not compatible from
2.4 to 2.6 we need a special case to avoid failure.  This sets a special
indicator variable in the install rules that enables a compatibility
hack to support the old install rule format.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** CMakeLists.txt	16 Dec 2008 20:00:17 -0000	1.20
--- CMakeLists.txt	5 Jan 2009 16:05:57 -0000	1.21
***************
*** 73,76 ****
--- 73,81 ----
      SET(CMAKE_INSTALL_DESTINATION_ARGS 
        BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
+   ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+     # Since the built CMake will install itself instead of the
+     # generating CMake, tell it that the install rules were generated
+     # by CMake 2.4.
+     INSTALL(CODE "SET(CMAKE_INSTALL_SELF_2_4 1)")
    ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
    # if qt is not static and we are on windows then skip the install