Attachment 81129 Details for Bug 65981 – Unbreak with Ninja

[patch] Unbreak with Ninja

0001-Unbreak-building-with-Ninja-generator.patch (text/plain), 15.03 KB, created by Jasper Lievisse Adriaanse on 2013-06-20 18:54:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jasper Lievisse Adriaanse

Created: 2013-06-20 18:54:02 UTC

Size: 15.03 KB

patch

obsolete

>From b9cd2d15e91cb4c1ed007791fbb22260aa2ace22 Mon Sep 17 00:00:00 2001
>From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
>Date: Thu, 20 Jun 2013 20:48:12 +0200
>Subject: [PATCH] Unbreak building with Ninja generator
>
>https://bugs.freedesktop.org/show_bug.cgi?id=65981
>---
> cmake/modules/TpQtMacros.cmake | 195 +++++++++++++++++++++++++----------------
> 1 file changed, 118 insertions(+), 77 deletions(-)
>
>diff --git a/cmake/modules/TpQtMacros.cmake b/cmake/modules/TpQtMacros.cmake
>index 38f4af6..640c37c 100644
>--- a/cmake/modules/TpQtMacros.cmake
>+++ b/cmake/modules/TpQtMacros.cmake
>@@ -217,20 +217,26 @@ function(tpqt_client_generator spec group pretty_include namespace)
>             --must-define=IN_TP_QT_HEADER
>             --visibility=TP_QT_EXPORT
>             ${client_generator_args})
>-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp
>-        COMMAND ${PYTHON_EXECUTABLE}
>-        ARGS ${ARGS}
>-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>-
>-        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>-                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
>-    add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)
>-    add_dependencies(all-generated-sources generate_cli-${spec}-body)
> 
>     if (client_generator_depends)
>-        add_dependencies(generate_cli-${spec}-body ${client_generator_depends})
>+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp
>+            COMMAND ${PYTHON_EXECUTABLE}
>+            ARGS ${ARGS}
>+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>+            DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                    ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py ${client_generator_depends})
>+    else (client_generator_depends)
>+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp
>+            COMMAND ${PYTHON_EXECUTABLE}
>+            ARGS ${ARGS}
>+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>+            DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                    ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
>     endif (client_generator_depends)
> 
>+    add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)
>+    add_dependencies(all-generated-sources generate_cli-${spec}-body)
>+
>     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h
>                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp
>                        "generate_cli-${spec}-body")
>@@ -253,20 +259,26 @@ function(tpqt_future_client_generator spec namespace)
>             --extraincludes='<TelepathyQt/future-internal.h>'
>             --visibility=TP_QT_NO_EXPORT
>             ${future_client_generator_args})
>-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp
>-        COMMAND ${PYTHON_EXECUTABLE}
>-        ARGS ${ARGS}
>-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>-
>-        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>-                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
>-    add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)
>-    add_dependencies(all-generated-sources generate_future-${spec}-body)
> 
>     if (future_client_generator_depends)
>-        add_dependencies(generate_future-${spec}-body ${future_client_generator_depends})
>+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp
>+            COMMAND ${PYTHON_EXECUTABLE}
>+            ARGS ${ARGS}
>+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>+            DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                    ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py ${future_client_generator_depends})
>+    else (future_client_generator_depends)
>+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp
>+            COMMAND ${PYTHON_EXECUTABLE}
>+            ARGS ${ARGS}
>+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>+            DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                    ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
>     endif (future_client_generator_depends)
> 
>+    add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)
>+    add_dependencies(all-generated-sources generate_future-${spec}-body)
>+
>     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h
>                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.moc.hpp
>                        "generate_future-${spec}-body")
>@@ -288,20 +300,26 @@ function(tpqt_service_generator spec group pretty_include namespace)
>             --ifacexml=${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-svc-${spec}.xml
>             --visibility=TP_QT_EXPORT
>             ${service_generator_args})
>-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp
>-        COMMAND ${PYTHON_EXECUTABLE}
>-        ARGS ${ARGS}
>-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>-
>-        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>-                ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py)
>-    add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp)
>-    add_dependencies(all-generated-service-sources generate_service-${spec}-body)
> 
>     if (service_generator_depends)
>-        add_dependencies(generate_service-${spec}-body ${service_generator_depends})
>+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp
>+            COMMAND ${PYTHON_EXECUTABLE}
>+            ARGS ${ARGS}
>+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>+            DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                    ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py ${service_generator_depends})
>+    else (service_generator_depends)
>+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp
>+            COMMAND ${PYTHON_EXECUTABLE}
>+            ARGS ${ARGS}
>+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>+            DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                    ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py)
>     endif (service_generator_depends)
> 
>+    add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp)
>+    add_dependencies(all-generated-service-sources generate_service-${spec}-body)
>+
>     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h
>                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.moc.hpp
>                        "generate_service-${spec}-body")
>@@ -331,22 +349,27 @@ function(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
>     # Gather all .xml files in TelepathyQt and spec/ and make this target depend on those
>     file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml)
> 
>-    add_custom_command(OUTPUT ${_OUTPUT_FILE}
>-
>-                       COMMAND ${PYTHON_EXECUTABLE}
>-
>-                       ARGS ${CMAKE_SOURCE_DIR}/tools/xincludator.py
>-                            ${_INPUT_FILE}
>-                            ${xincludator_gen_args}
>-                            > ${_OUTPUT_FILE}
>-
>-                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/xincludator.py
>-                               ${_INPUT_FILE} ${depends_xml_files})
>-    add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTPUT_FILE})
>-
>     if (xincludator_gen_depends)
>-        add_dependencies(${_TARGET_NAME} ${xincludator_gen_depends})
>+        add_custom_command(OUTPUT ${_OUTPUT_FILE}
>+                           COMMAND ${PYTHON_EXECUTABLE}
>+                           ARGS ${CMAKE_SOURCE_DIR}/tools/xincludator.py
>+                                ${_INPUT_FILE}
>+                                ${xincludator_gen_args}
>+                                > ${_OUTPUT_FILE}
>+                           DEPENDS ${CMAKE_SOURCE_DIR}/tools/xincludator.py
>+                                   ${_INPUT_FILE} ${depends_xml_files} ${xincludator_gen_depends})
>+    else (xincludator_gen_depends)
>+        add_custom_command(OUTPUT ${_OUTPUT_FILE}
>+                           COMMAND ${PYTHON_EXECUTABLE}
>+                           ARGS ${CMAKE_SOURCE_DIR}/tools/xincludator.py
>+                                ${_INPUT_FILE}
>+                                ${xincludator_gen_args}
>+                                > ${_OUTPUT_FILE}
>+                           DEPENDS ${CMAKE_SOURCE_DIR}/tools/xincludator.py
>+                                   ${_INPUT_FILE} ${depends_xml_files})
>     endif (xincludator_gen_depends)
>+
>+    add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTPUT_FILE})
> endfunction(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
> 
> function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
>@@ -354,24 +377,30 @@ function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
>     # Gather all .xml files in TelepathyQt and spec/ and make this target depend on those
>     file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml)
> 
>-    add_custom_command(OUTPUT ${_OUTFILE}
>-
>-                       COMMAND ${PYTHON_EXECUTABLE}
>-
>-                       ARGS    ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
>-                               ${constants_gen_args}
>-                               --specxml=${_SPEC_XML}
>-                               > ${_OUTFILE}
>+    if (constants_gen_depends)
>+        add_custom_command(OUTPUT ${_OUTFILE}
>+                           COMMAND ${PYTHON_EXECUTABLE}
>+                           ARGS    ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
>+                                   ${constants_gen_args}
>+                                   --specxml=${_SPEC_XML}
>+                                   > ${_OUTFILE}
>+                           DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                                   ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
>+                                   ${_SPEC_XML} ${depends_xml_files} ${constants_gen_depends})
>+    else (constants_gen_depends)
>+        add_custom_command(OUTPUT ${_OUTFILE}
>+                           COMMAND ${PYTHON_EXECUTABLE}
>+                           ARGS    ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
>+                                   ${constants_gen_args}
>+                                   --specxml=${_SPEC_XML}
>+                                   > ${_OUTFILE}
>+                           DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                                   ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
>+                                   ${_SPEC_XML} ${depends_xml_files})
>+    endif (constants_gen_depends)
> 
>-                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>-                               ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
>-                               ${_SPEC_XML} ${depends_xml_files})
>     add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTFILE})
>     add_dependencies(all-generated-sources ${_TARGET_NAME})
>-
>-    if (constants_gen_depends)
>-        add_dependencies(${_TARGET_NAME} ${constants_gen_depends})
>-    endif (constants_gen_depends)
> endfunction (tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
> 
> function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
>@@ -379,26 +408,38 @@ function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAME
>     # Gather all .xml files in TelepathyQt and spec/ and make this target depend on those
>     file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml)
> 
>-    add_custom_command(OUTPUT ${_OUTFILE_DECL} ${_OUTFILE_IMPL}
>-                       COMMAND ${PYTHON_EXECUTABLE}
>-                       ARGS ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
>-                            --namespace=${_NAMESPACE}
>-                            --declfile=${_OUTFILE_DECL}
>-                            --implfile=${_OUTFILE_IMPL}
>-                            --realinclude=${_REALINCLUDE}
>-                            --prettyinclude=${_PRETTYINCLUDE}
>-                            ${types_gen_args}
>-                            --specxml=${_SPEC_XML}
>-
>-                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>-                               ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
>-                               ${_SPEC_XML} ${depends_xml_files})
>-    add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTFILE_IMPL})
>-    add_dependencies(all-generated-sources ${_TARGET_NAME})
>-
>     if (types_gen_depends)
>-        add_dependencies(${_TARGET_NAME} ${types_gen_depends})
>+        add_custom_command(OUTPUT ${_OUTFILE_DECL} ${_OUTFILE_IMPL}
>+                           COMMAND ${PYTHON_EXECUTABLE}
>+                           ARGS ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
>+                                --namespace=${_NAMESPACE}
>+                                --declfile=${_OUTFILE_DECL}
>+                                --implfile=${_OUTFILE_IMPL}
>+                                --realinclude=${_REALINCLUDE}
>+                                --prettyinclude=${_PRETTYINCLUDE}
>+                                ${types_gen_args}
>+                                --specxml=${_SPEC_XML}
>+                           DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                                   ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
>+                                   ${_SPEC_XML} ${depends_xml_files} ${types_gen_depends})
>+    else (types_gen_depends)
>+        add_custom_command(OUTPUT ${_OUTFILE_DECL} ${_OUTFILE_IMPL}
>+                           COMMAND ${PYTHON_EXECUTABLE}
>+                           ARGS ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
>+                                --namespace=${_NAMESPACE}
>+                                --declfile=${_OUTFILE_DECL}
>+                                --implfile=${_OUTFILE_IMPL}
>+                                --realinclude=${_REALINCLUDE}
>+                                --prettyinclude=${_PRETTYINCLUDE}
>+                                ${types_gen_args}
>+                                --specxml=${_SPEC_XML}
>+                           DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
>+                                   ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
>+                                   ${_SPEC_XML} ${depends_xml_files})
>     endif (types_gen_depends)
>+
>+    add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTFILE_IMPL})
>+    add_dependencies(all-generated-sources ${_TARGET_NAME})
> endfunction(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
> 
> macro(tpqt_add_generic_unit_test _fancyName _name)
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 65981: 81129

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.