[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.22 1.23

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
Fix installation when built by CMake 2.4

CMake 2.4 generates old-style cmake_install.cmake code including calls
to the file(INSTALL) command with the COMPONENTS argument.  We need to
set CMAKE_INSTALL_SELF_2_4 for the whole install tree to prevent the
command from complaining in this special case.  Previously this was
needed only in the QtDialog directory, but now it is needed in the
entire tree.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** CMakeLists.txt	13 Feb 2009 21:28:09 -0000	1.22
--- CMakeLists.txt	31 Jul 2009 12:27:36 -0000	1.23
***************
*** 75,83 ****
      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
--- 75,78 ----