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

List:       kde-commits
Subject:    KDE/kdevplatform/kross
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2008-07-31 0:41:01
Message-ID: 1217464861.996659.26477.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 839876 by apol:

Don't force to have cpptoxml, if the system doesn't have it, cmake won't try to regenerate.


 M  +32 -28    CMakeLists.txt  
 M  +4 -8      xmltokross/CMakeLists.txt  


--- trunk/KDE/kdevplatform/kross/CMakeLists.txt #839875:839876
@@ -1,18 +1,6 @@
 project(krosssupport)
 
 add_subdirectory(xmltokross)
-macro(kdev_create_kross_iface interface output includes)
-    get_filename_component(weFile ${output} NAME_WE)
-    get_filename_component(outPath ${output} PATH)
-    
-    add_custom_command(OUTPUT ${output} ${headerFile}
-                        COMMAND ${CPPTOXML} \
-C${CMAKE_CURRENT_SOURCE_DIR}/xmltokross/rppconfig.h -Q/smthwrong/${QT_INCLUDE_DIR} \
                ${interface} |
-                            ${CMAKE_CURRENT_BINARY_DIR}/xmltokross/xmltokross -D${outPath} \
                -F${weFile} -I${includes} > ${output}
-                        MAIN_DEPENDENCY ${interface}
-                        DEPENDS xmltokross )
-    set(mocFile ${weFile}.moc)
-    qt4_generate_moc( ${output} ${CMAKE_CURRENT_BINARY_DIR}/${mocFile})
-endmacro(kdev_create_kross_iface)
 
 include_directories(
     ${KDE4_INCLUDES}
@@ -29,24 +17,40 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/wrappers
 )
 
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/idocument.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krossidocument.cpp idocument.h)
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/iuicontroller.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krossiuicontroller.cpp iuicontroller.h)
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/context.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krosscontext.cpp context.h)
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/contextmenuextension.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krosscontextmenuextension.cpp contextmenuextension.h)
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/project/projectmodel.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krossprojectmodel.cpp projectmodel.h)
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/vcs/vcsrevision.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krossvcsrevision.cpp vcsrevision.h)
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/vcs/vcslocation.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krossvcslocation.cpp vcslocation.h)
-kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/language/duchain/topducontext.h
-    ${CMAKE_SOURCE_DIR}/kross/wrappers/krosstopducontext.cpp topducontext.h)
+find_program(CPPTOXML cpptoxml)
 
+if(CPPTOXML)
+    macro(kdev_create_kross_iface interface output includes)
+        get_filename_component(weFile ${output} NAME_WE)
+        get_filename_component(outPath ${output} PATH)
+        
+        add_custom_command(OUTPUT ${output} ${headerFile}
+                            COMMAND ${CPPTOXML} \
-C${CMAKE_CURRENT_SOURCE_DIR}/xmltokross/rppconfig.h -Q/smthwrong/${QT_INCLUDE_DIR} \
${interface} | +                                \
${CMAKE_CURRENT_BINARY_DIR}/xmltokross/xmltokross -D${outPath} -F${weFile} -I${includes} > \
${output} +                            MAIN_DEPENDENCY ${interface}
+                            DEPENDS xmltokross )
+        set(mocFile ${weFile}.moc)
+        qt4_generate_moc( ${output} ${CMAKE_CURRENT_BINARY_DIR}/${mocFile})
+    endmacro(kdev_create_kross_iface)
 
+    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/idocument.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krossidocument.cpp idocument.h)
+    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/iuicontroller.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krossiuicontroller.cpp iuicontroller.h)
+    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/context.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krosscontext.cpp context.h)
+    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/interfaces/contextmenuextension.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krosscontextmenuextension.cpp \
contextmenuextension.h) +    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/project/projectmodel.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krossprojectmodel.cpp projectmodel.h)
+    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/vcs/vcsrevision.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krossvcsrevision.cpp vcsrevision.h)
+    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/vcs/vcslocation.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krossvcslocation.cpp vcslocation.h)
+    kdev_create_kross_iface(${CMAKE_SOURCE_DIR}/language/duchain/topducontext.h
+        ${CMAKE_SOURCE_DIR}/kross/wrappers/krosstopducontext.cpp topducontext.h)
+endif(CPPTOXML)
+
 set(kdevkrossplugin_SRCS
     krossplugin.cpp
     krossbuildsystemmanager.cpp
--- trunk/KDE/kdevplatform/kross/xmltokross/CMakeLists.txt #839875:839876
@@ -1,11 +1,7 @@
 
-find_program(CPPTOXML cpptoxml)
+add_executable(xmltokross main.cpp)
+target_link_libraries(xmltokross ${QT_QTCORE_LIBRARY})
 
-# if(CPPTOXML)
-    add_executable(xmltokross main.cpp)
-    target_link_libraries(xmltokross ${QT_QTCORE_LIBRARY})
-
-    add_executable(xmltokrossimpl abstractclasses.cpp)
-    target_link_libraries(xmltokrossimpl ${QT_QTCORE_LIBRARY})
+add_executable(xmltokrossimpl abstractclasses.cpp)
+target_link_libraries(xmltokrossimpl ${QT_QTCORE_LIBRARY})
  
-# endif(CPPTOXML)


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