summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-07-28 10:27:33 +0800
committerruki <[email protected]>2017-07-28 10:27:45 +0800
commit222d8bbce334904d1a7cb3514d2655fe10b9fd35 (patch)
treeb5b8662d6bca7324c2ab6108b7bb1aa83d156d1b
parentc109f84c28886f553c949b64944e06e97d2387b4 (diff)
disable precompiled header for makefile plugin
-rw-r--r--tests/projects/precompiled_header_c++/xmake.lua4
-rw-r--r--xmake/plugins/project/makefile/makefile.lua6
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/projects/precompiled_header_c++/xmake.lua b/tests/projects/precompiled_header_c++/xmake.lua
index 6460d46c4..322d27579 100644
--- a/tests/projects/precompiled_header_c++/xmake.lua
+++ b/tests/projects/precompiled_header_c++/xmake.lua
@@ -4,6 +4,10 @@ target("main")
-- set kind
set_kind("binary")
+ -- set language: c++11
+ set_languages("cxx11")
+
+ -- set precompiled header
set_precompiled_header("src/header.hpp")
-- add files
diff --git a/xmake/plugins/project/makefile/makefile.lua b/xmake/plugins/project/makefile/makefile.lua
index d036c7240..f0326e6e2 100644
--- a/xmake/plugins/project/makefile/makefile.lua
+++ b/xmake/plugins/project/makefile/makefile.lua
@@ -348,6 +348,12 @@ function _make_all(makefile)
end
makefile:print("")
+ -- TODO
+ -- disable precompiled header first
+ for _, target in pairs(project.targets()) do
+ target:set("precompiled_header", nil)
+ end
+
-- make variables for target flags
for targetname, target in pairs(project.targets()) do
if not target:isphony() then