summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierreEVEN <[email protected]>2025-05-15 13:26:43 +0200
committerPierreEVEN <[email protected]>2025-05-15 13:26:43 +0200
commitc5b26a438fafc562c8bc848c48f397f607fcaddd (patch)
tree539e311eb0c90249c850bb99388918b642474114
parent7f0d792d890e15677057c545a7b3d5f7eb52da52 (diff)
renamed XMAKE_GLOBAL_COMPILER_ID to CURRENT_COMPILER_ID (advice from https://github.com/xmake-io/xmake/pull/6439\#discussion_r2090681624)
-rw-r--r--xmake/plugins/project/cmake/cmakelists.lua26
1 files changed, 13 insertions, 13 deletions
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
index e29115712..e650dd369 100644
--- a/xmake/plugins/project/cmake/cmakelists.lua
+++ b/xmake/plugins/project/cmake/cmakelists.lua
@@ -370,9 +370,9 @@ function _add_project(cmakelists, outputdir)
end
-- Define a language-independant global compiler_id variable
if (languages and #languages > 0) then
- cmakelists:print("set(XMAKE_GLOBAL_COMPILER_ID ${CMAKE_%s_COMPILER_ID})", _get_project_languages()[1])
+ cmakelists:print("set(CURRENT_COMPILER_ID ${CMAKE_%s_COMPILER_ID})", _get_project_languages()[1])
else
- cmakelists:print("set(XMAKE_GLOBAL_COMPILER_ID ${CMAKE_C_COMPILER_ID})") -- C should be defined by default if not specified
+ cmakelists:print("set(CURRENT_COMPILER_ID ${CMAKE_C_COMPILER_ID})") -- C should be defined by default if not specified
end
cmakelists:print("")
end
@@ -790,7 +790,7 @@ function _add_target_compile_options(cmakelists, target, outputdir)
for _, toolname in toolnames:keys() do
local name = compilernames[toolname]
if name then
- cmakelists:print("if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"%s\")", name)
+ cmakelists:print("if(CURRENT_COMPILER_ID STREQUAL \"%s\")", name)
_add_target_compile_options_for_compiler(toolname)
cmakelists:print("endif()")
end
@@ -817,17 +817,17 @@ function _add_target_values(cmakelists, target, name)
if name:endswith("s") then
name = name:sub(1, #name - 1)
end
- cmakelists:print("if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"MSVC\")")
+ cmakelists:print("if(CURRENT_COMPILER_ID STREQUAL \"MSVC\")")
local flags_cl = _map_compflags("cl", "c", name, values)
for _, flag in ipairs(flags_cl) do
cmakelists:print(" target_compile_options(%s PRIVATE %s)", target:name(), flag)
end
- cmakelists:print("elseif(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"Clang\")")
+ cmakelists:print("elseif(CURRENT_COMPILER_ID STREQUAL \"Clang\")")
local flags_clang = _map_compflags("clang", "c", name, values)
for _, flag in ipairs(flags_clang) do
cmakelists:print(" target_compile_options(%s PRIVATE %s)", target:name(), flag)
end
- cmakelists:print("elseif(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"GNU\")")
+ cmakelists:print("elseif(CURRENT_COMPILER_ID STREQUAL \"GNU\")")
local flags_gcc = _map_compflags("gcc", "c", name, values)
for _, flag in ipairs(flags_gcc) do
cmakelists:print(" target_compile_options(%s PRIVATE %s)", target:name(), flag)
@@ -894,7 +894,7 @@ function _add_target_languages(cmakelists, target)
if flag:endswith('++') then
cmakelists:print('foreach(standard 26 23 20 17 14 11 98)')
cmakelists:print(' include(CheckCXXCompilerFlag)')
- cmakelists:print(' if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"MSVC\")')
+ cmakelists:print(' if(CURRENT_COMPILER_ID STREQUAL \"MSVC\")')
cmakelists:print(' check_cxx_compiler_flag("/std:%s${standard}" %s_support_%s_standard_${standard})', flag, target:name(), flag)
cmakelists:print(' else()')
cmakelists:print(' check_cxx_compiler_flag("-std=%s${standard}" %s_support_%s_standard_${standard})', flag, target:name(), flag)
@@ -907,7 +907,7 @@ function _add_target_languages(cmakelists, target)
else
cmakelists:print('foreach(standard 23 17 11 99 90)')
cmakelists:print(' include(CheckCCompilerFlag)')
- cmakelists:print(' if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"MSVC\")')
+ cmakelists:print(' if(CURRENT_COMPILER_ID STREQUAL \"MSVC\")')
cmakelists:print(' check_c_compiler_flag("/std:%s${standard}" %s_support_%s_standard_${standard})', flag, target:name(), flag)
cmakelists:print(' else()')
cmakelists:print(' check_c_compiler_flag("-std=%s${standard}" %s_support_%s_standard_${standard})', flag, target:name(), flag)
@@ -947,7 +947,7 @@ function _add_target_optimization(cmakelists, target)
}
local optimization = target:get("optimize")
if optimization then
- cmakelists:print("if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"MSVC\")")
+ cmakelists:print("if(CURRENT_COMPILER_ID STREQUAL \"MSVC\")")
cmakelists:print(" target_compile_options(%s PRIVATE %s)", target:name(), flags_msvc[optimization])
cmakelists:print("else()")
cmakelists:print(" target_compile_options(%s PRIVATE %s)", target:name(), flags_gcc[optimization])
@@ -975,7 +975,7 @@ function _add_target_symbols(cmakelists, target)
if levels:has("hidden") then
table.insert(flags_gcc, "-fvisibility=hidden")
end
- cmakelists:print("if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"MSVC\")")
+ cmakelists:print("if(CURRENT_COMPILER_ID STREQUAL \"MSVC\")")
if #flags_msvc > 0 then
cmakelists:print(" target_compile_options(%s PRIVATE %s)", target:name(), table.concat(flags_msvc, " "))
end
@@ -996,7 +996,7 @@ function _add_target_runtimes(cmakelists, target)
local cmake_minver = _get_cmake_minver()
if cmake_minver:ge("3.15.0") then
local runtimes = target:get("runtimes")
- cmakelists:print("if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"MSVC\")")
+ cmakelists:print("if(CURRENT_COMPILER_ID STREQUAL \"MSVC\")")
if runtimes then
if runtimes == "MT" then
runtimes = "MultiThreaded"
@@ -1111,7 +1111,7 @@ function _add_target_link_directories(cmakelists, target, outputdir)
end
cmakelists:print(")")
else
- cmakelists:print("if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"MSVC\")")
+ cmakelists:print("if(CURRENT_COMPILER_ID STREQUAL \"MSVC\")")
cmakelists:print(" target_link_libraries(%s PRIVATE", target:name())
for _, linkdir in ipairs(linkdirs) do
cmakelists:print(" -libpath:" .. _get_relative_unix_path(linkdir, outputdir))
@@ -1178,7 +1178,7 @@ function _add_target_link_options(cmakelists, target, outputdir)
for _, toolname in toolnames:keys() do
local name = linkernames[toolname]
if name then
- cmakelists:print("if(XMAKE_GLOBAL_COMPILER_ID STREQUAL \"%s\")", name)
+ cmakelists:print("if(CURRENT_COMPILER_ID STREQUAL \"%s\")", name)
_add_target_link_options_for_linker(toolname)
cmakelists:print("endif()")
end