You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2018/01/22 15:43:54 UTC
[1/2] trafodion git commit: fixed a negligible error when compile
without setting QT_TOOLKIT
Repository: trafodion
Updated Branches:
refs/heads/master c702b48ad -> e996d3496
fixed a negligible error when compile without setting QT_TOOLKIT
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f8acc2f5
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f8acc2f5
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f8acc2f5
Branch: refs/heads/master
Commit: f8acc2f5d8a12d25c7d063393cb79c1b2098b3f2
Parents: f06ea68
Author: Kenny <xi...@esgyn.cn>
Authored: Fri Jan 19 08:05:45 2018 +0000
Committer: Kenny <xi...@esgyn.cn>
Committed: Fri Jan 19 08:05:45 2018 +0000
----------------------------------------------------------------------
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f8acc2f5/core/sql/nskgmake/SqlCompilerDebugger/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/SqlCompilerDebugger/Makefile b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
index 2d49b72..5e67005 100644
--- a/core/sql/nskgmake/SqlCompilerDebugger/Makefile
+++ b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
@@ -38,7 +38,9 @@ $(CMPGUI_FINAL) : cmpdbg_qt_build
# optional component, ignore cp return code
cmpdbg_qt_build :
cd ../$(basename $(CMPGUI_OBJ)) && . ./mk.sh
+ifneq ($(QT_TOOLKIT),"")
-cp -f ../$(basename $(CMPGUI_OBJ))/$(LIBPREFIX)$(notdir $(obj)) $(CMPGUI_FINAL)
+endif
#when clean, this clean first
[2/2] trafodion git commit: Merge [TRAFODION-2919] PR-1409 fixed a
negligible error when compile without setting QT_TOOLKIT
Posted by su...@apache.org.
Merge [TRAFODION-2919] PR-1409 fixed a negligible error when compile without setting QT_TOOLKIT
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e996d349
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e996d349
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e996d349
Branch: refs/heads/master
Commit: e996d3496a494f9a6ed436ebebefdb5d22ba1390
Parents: c702b48 f8acc2f
Author: Suresh Subbiah <su...@apache.org>
Authored: Mon Jan 22 15:43:27 2018 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Mon Jan 22 15:43:27 2018 +0000
----------------------------------------------------------------------
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------