[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.187 1.188

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
some tweaks as suggested by Brad (no functional changes)

-set the type of the IMPORTED libraries to UNKNOWN, this way also on Windows
only the "LOCATION" property has to be set
-the if() around the SET(QT_${basename}_FOUND 1) was useless (always true)
-the mapping of the configuration types DEBUG and PROFILE did not belong here

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.187
retrieving revision 1.188
diff -C 2 -d -r1.187 -r1.188
*** FindQt4.cmake	17 Jan 2010 16:37:53 -0000	1.187
--- FindQt4.cmake	18 Jan 2010 18:38:38 -0000	1.188
***************
*** 843,866 ****
      IF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
        IF(NOT TARGET Qt4ImportedTarget__${basename})
!         ADD_LIBRARY(Qt4ImportedTarget__${basename} SHARED IMPORTED )
! 
!         IF(WIN32)
!           SET(_QT4_LIBRARY_PROPERTY_NAME IMPLIB)
!         ELSE(WIN32)
!           SET(_QT4_LIBRARY_PROPERTY_NAME LOCATION)
!         ENDIF(WIN32)
! 
  
          IF (QT_${basename}_LIBRARY_RELEASE)
            SET_PROPERTY(TARGET Qt4ImportedTarget__${basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
!           SET_PROPERTY(TARGET Qt4ImportedTarget__${basename}        PROPERTY IMPORTED_${_QT4_LIBRARY_PROPERTY_NAME}_RELEASE "${QT_${basename}_LIBRARY_RELEASE}" )
          ENDIF (QT_${basename}_LIBRARY_RELEASE)
  
          IF (QT_${basename}_LIBRARY_DEBUG)
            SET_PROPERTY(TARGET Qt4ImportedTarget__${basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
!           SET_PROPERTY(TARGET Qt4ImportedTarget__${basename}        PROPERTY IMPORTED_${_QT4_LIBRARY_PROPERTY_NAME}_DEBUG "${QT_${basename}_LIBRARY_DEBUG}" )
! 
!           SET_PROPERTY(TARGET Qt4ImportedTarget__${basename} PROPERTY MAP_IMPORTED_CONFIG_PROFILE   DEBUG)
!           SET_PROPERTY(TARGET Qt4ImportedTarget__${basename} PROPERTY MAP_IMPORTED_CONFIG_DEBUGFULL DEBUG)
          ENDIF (QT_${basename}_LIBRARY_DEBUG)
  
--- 843,856 ----
      IF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
        IF(NOT TARGET Qt4ImportedTarget__${basename})
!         ADD_LIBRARY(Qt4ImportedTarget__${basename} UNKNOWN IMPORTED )
  
          IF (QT_${basename}_LIBRARY_RELEASE)
            SET_PROPERTY(TARGET Qt4ImportedTarget__${basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
!           SET_PROPERTY(TARGET Qt4ImportedTarget__${basename}        PROPERTY IMPORTED_LOCATION_RELEASE "${QT_${basename}_LIBRARY_RELEASE}" )
          ENDIF (QT_${basename}_LIBRARY_RELEASE)
  
          IF (QT_${basename}_LIBRARY_DEBUG)
            SET_PROPERTY(TARGET Qt4ImportedTarget__${basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
!           SET_PROPERTY(TARGET Qt4ImportedTarget__${basename}        PROPERTY IMPORTED_LOCATION_DEBUG "${QT_${basename}_LIBRARY_DEBUG}" )
          ENDIF (QT_${basename}_LIBRARY_DEBUG)
  
***************
*** 868,874 ****
          SET(QT_${basename}_LIBRARIES     Qt4ImportedTarget__${basename} )
  
!         IF (QT_${basename}_LIBRARY)
!           SET(QT_${basename}_FOUND 1)
!         ENDIF (QT_${basename}_LIBRARY)
  
        ENDIF(NOT TARGET Qt4ImportedTarget__${basename})
--- 858,862 ----
          SET(QT_${basename}_LIBRARIES     Qt4ImportedTarget__${basename} )
  
!         SET(QT_${basename}_FOUND 1)
  
        ENDIF(NOT TARGET Qt4ImportedTarget__${basename})