Merge pull request #1419 from starkos/fix/issue-1411
Fix #1411: Remove "|" from Codelite config names
This commit is contained in:
commit
7cad09ed18
@ -5,8 +5,9 @@
|
||||
-- Modified by: Andrea Zanellato
|
||||
-- Andrew Gough
|
||||
-- Manu Evans
|
||||
-- Jason Perkins
|
||||
-- Created: 2013/05/06
|
||||
-- Copyright: (c) 2008-2015 Jason Perkins and the Premake project
|
||||
-- Copyright: (c) 2008-2020 Jason Perkins and the Premake project
|
||||
--
|
||||
|
||||
local p = premake
|
||||
@ -21,7 +22,8 @@
|
||||
function codelite.cfgname(cfg)
|
||||
local cfgname = cfg.buildcfg
|
||||
if codelite.workspace.multiplePlatforms then
|
||||
cfgname = string.format("%s|%s", cfg.platform, cfg.buildcfg)
|
||||
-- Codelite breaks if "|" is used here, see #1411
|
||||
cfgname = string.format("%s-%s", cfg.platform, cfg.buildcfg)
|
||||
end
|
||||
return cfgname
|
||||
end
|
||||
|
@ -191,3 +191,34 @@
|
||||
</CodeLite_Workspace>
|
||||
]])
|
||||
end
|
||||
|
||||
---
|
||||
-- Test handling of platforms
|
||||
---
|
||||
|
||||
function suite.onPlatforms()
|
||||
workspace "MyWorkspace"
|
||||
platforms { "x86_64", "x86" }
|
||||
|
||||
prepare()
|
||||
test.capture [[
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<CodeLite_Workspace Name="MyWorkspace" Database="" SWTLW="No">
|
||||
<Project Name="MyProject" Path="MyProject.project"/>
|
||||
<BuildMatrix>
|
||||
<WorkspaceConfiguration Name="x86_64-Debug" Selected="yes">
|
||||
<Project Name="MyProject" ConfigName="x86_64-Debug"/>
|
||||
</WorkspaceConfiguration>
|
||||
<WorkspaceConfiguration Name="x86-Debug" Selected="yes">
|
||||
<Project Name="MyProject" ConfigName="x86-Debug"/>
|
||||
</WorkspaceConfiguration>
|
||||
<WorkspaceConfiguration Name="x86_64-Release" Selected="yes">
|
||||
<Project Name="MyProject" ConfigName="x86_64-Release"/>
|
||||
</WorkspaceConfiguration>
|
||||
<WorkspaceConfiguration Name="x86-Release" Selected="yes">
|
||||
<Project Name="MyProject" ConfigName="x86-Release"/>
|
||||
</WorkspaceConfiguration>
|
||||
</BuildMatrix>
|
||||
</CodeLite_Workspace>
|
||||
]]
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user