[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdelibs4_snapshot/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2006-07-11 15:12:06
Message-ID: 1152630726.196408.20999.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 560968 by mlaurent:

Allow to specify classname.
It's necessary to fix karm compile
it uses same xml file but two different class and
use the same lib
=>it defined same object => we can't link.
(it's very specific case)


 M  +11 -3     FindQt4.cmake  


--- branches/work/kdelibs4_snapshot/cmake/modules/FindQt4.cmake #560967:560968
@@ -894,14 +894,22 @@
        STRING(TOLOWER ${_basename} _basename)
     ENDIF (_optionalBasename)
 
-    SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+    SET(_optionalClassName "${ARGV5}")
+	SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
     SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
     SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
-
-    ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+	
+	IF(_optionalClassName)
+       ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+          COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -c \
${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile} +          DEPENDS \
${_infile} +        )			
+	ELSE(_optionalClassName)
+       ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
           COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -i ${_include} -l \
${_parentClass} ${_infile}  DEPENDS ${_infile}
         )
+	ENDIF(_optionalClassName)
 
     QT4_GENERATE_MOC(${_header} ${_moc})
     SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)


[prev in list] [next in list] [prev in thread] [next in thread]