support c++ command

3 files changed, 86 insertions, 1 deletions

diff --git a/xmake/modules/core/tools/cxx.lua b/xmake/modules/core/tools/cxx.lua
new file mode 100644
index 000000000..0e53e0134
--- /dev/null
+++ b/xmake/modules/core/tools/cxx.lua
@@ -0,0 +1,24 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        cxx.lua
+--
+
+-- inherit gcc
+inherit("gcc")
+
+
diff --git a/xmake/modules/core/tools/gxx.lua b/xmake/modules/core/tools/gxx.lua
index be14f79e7..ec7ea3838 100644
--- a/xmake/modules/core/tools/gxx.lua
+++ b/xmake/modules/core/tools/gxx.lua
@@ -15,7 +15,7 @@
 -- Copyright (C) 2015-present, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        g++.lua
+-- @file        gxx.lua
 --
 
 -- inherit gcc
diff --git a/xmake/modules/detect/tools/find_cxx.lua b/xmake/modules/detect/tools/find_cxx.lua
new file mode 100644
index 000000000..c21fe8ad4
--- /dev/null
+++ b/xmake/modules/detect/tools/find_cxx.lua
@@ -0,0 +1,61 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_cxx.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find c++
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local cxx = find_cxx()
+-- local cxx, version, hintname = find_cxx({program = "xcrun -sdk macosx c++", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+
+    -- find program
+    local program = find_program(opt.program or "c++", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt and opt.version then
+        version = find_programver(program, opt)
+    end
+
+    -- is clang++ or c++
+    local is_clang = false
+    if program then
+        local versioninfo = os.iorunv(program, {"--version"})
+        if versioninfo and versioninfo:find("clang", 1, true) then
+            is_clang = true
+        end
+    end
+    return program, version, (is_clang and "clangxx" or "cxx")
+end