qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject qpid-proton git commit: PROTON-1376: Serialize re-construction of generated files for Windows
Date Tue, 20 Dec 2016 18:55:56 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 79d06f070 -> 9377d859b


PROTON-1376: Serialize re-construction of generated files for Windows

Windows builds wrongly regenerate files for libraries qpid-proton and
qpid-proton-core. Regeneration creates file churn that sometimes
breaks builds. This patch introduces a phony dependency so that
the generated file reconstruction does not cause a problem.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/9377d859
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/9377d859
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/9377d859

Branch: refs/heads/master
Commit: 9377d859b5096dfeb3e00c935610784ecbc3c04f
Parents: 79d06f0
Author: Chuck Rolke <crolke@redhat.com>
Authored: Tue Dec 20 13:48:39 2016 -0500
Committer: Chuck Rolke <crolke@redhat.com>
Committed: Tue Dec 20 13:48:39 2016 -0500

----------------------------------------------------------------------
 proton-c/CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9377d859/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 5f26d43..f674eee 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -538,6 +538,14 @@ add_library(
   )
 add_dependencies(qpid-proton generated_c_files)
 
+if (MSVC)
+  # Add a phony dependency for Windows builds to serialize creation
+  # of generated files. See issue PROTON-1376.
+  # When a Windows build creates src/encodings.h and src/protocol.h
+  # only once then this can be removed.
+  add_dependencies(qpid-proton qpid-proton-core)
+endif (MSVC)
+
 target_link_libraries (qpid-proton ${UUID_LIB} ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS})
 
 set_target_properties (


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message