[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.16.2.3 1.16.2.4 CrossCompiler.ui 1.1.2.2 1.1.2.3

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jan 13 13:03:56 EST 2009


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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt CrossCompiler.ui 
Log Message:
ENH: merge in changes from CVS to branch for 2.6.3 RC 8


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -C 2 -d -r1.16.2.3 -r1.16.2.4
*** CMakeLists.txt	31 Dec 2008 15:14:30 -0000	1.16.2.3
--- CMakeLists.txt	13 Jan 2009 18:03:54 -0000	1.16.2.4
***************
*** 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

Index: CrossCompiler.ui
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CrossCompiler.ui,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C 2 -d -r1.1.2.2 -r1.1.2.3
*** CrossCompiler.ui	31 Dec 2008 15:14:30 -0000	1.1.2.2
--- CrossCompiler.ui	13 Jan 2009 18:03:54 -0000	1.1.2.3
***************
*** 40,44 ****
        </item>
        <item row="0" column="1" >
!        <widget class="QCMakeFilePathEditor" name="systemName" />
        </item>
        <item row="0" column="2" colspan="2" >
--- 40,44 ----
        </item>
        <item row="0" column="1" >
!        <widget class="QLineEdit" name="systemName" />
        </item>
        <item row="0" column="2" colspan="2" >
***************
*** 199,207 ****
     <container>1</container>
    </customwidget>
-   <customwidget>
-    <class>QCMakeFilePathEditor</class>
-    <extends>QLineEdit</extends>
-    <header>QCMakeWidgets.h</header>
-   </customwidget>
   </customwidgets>
   <tabstops>
--- 199,202 ----



More information about the Cmake-commits mailing list