Skip to content

Commit e8eb5c6

Browse files
committed
Added option only build the magick executable.
1 parent 8174050 commit e8eb5c6

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

src/CommandLineInfo.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ void CommandLineInfo::ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast
5656
_options->policyConfig=PolicyConfig::Limited;
5757
else if (_wcsicmp(pszParam, L"linkRuntime") == 0)
5858
_options->linkRuntime=TRUE;
59+
else if (_wcsicmp(pszParam, L"onlyMagick") == 0)
60+
_options->onlyMagick=TRUE;
5961
else if (_wcsicmp(pszParam, L"openCL") == 0)
6062
_options->useOpenCL=TRUE;
6163
else if (_wcsicmp(pszParam, L"openPolicy") == 0)

src/Options.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Options::Options(const wstring &rootDirectory)
2323
isImageMagick7=TRUE;
2424
isStaticBuild=FALSE;
2525
linkRuntime=FALSE;
26+
onlyMagick=FALSE;
2627
policyConfig=PolicyConfig::Open;
2728
quantumDepth=QuantumDepth::Q16;
2829
useHDRI=TRUE;

src/Options.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class Options
3333
BOOL installedSupport;
3434
BOOL isStaticBuild;
3535
BOOL linkRuntime;
36+
BOOL onlyMagick;
3637
PolicyConfig policyConfig;
3738
QuantumDepth quantumDepth;
3839
wstring rootDirectory;

src/Projects.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,23 @@ void Projects::createFuzzProjects(const Options &options,vector<Config> &configs
123123

124124
void Projects::createUtilitiesProjects(const Options &options,vector<Config> &configs,vector<Project> &projects)
125125
{
126-
auto utilitiesConfig=find_if(configs.begin(),configs.end(),[&](const auto &config) { return (config.name() == L"utilities"); });
126+
const auto utilitiesConfig=find_if(configs.begin(),configs.end(),[&](const auto &config) { return (config.name() == L"utilities"); });
127127
if (utilitiesConfig == configs.end())
128128
return;
129129

130-
Project utilitiesProject=Project::create(*utilitiesConfig,options);
130+
const auto utilitiesProject=Project::create(*utilitiesConfig,options);
131131

132-
vector<wstring> aliases = { L"compare", L"composite", L"conjure", L"identify", L"mogrify", L"montage", L"stream" };
132+
const auto aliases = { L"compare", L"composite", L"conjure", L"identify", L"mogrify", L"montage", L"stream" };
133133

134-
for (const auto& alias : aliases)
134+
if (options.isImageMagick7 && !options.onlyMagick)
135135
{
136-
if (options.isImageMagick7)
137-
createUtilityProject(utilitiesProject,alias,L"magick",projects);
138-
else
139-
createUtilityProject(utilitiesProject,alias,alias,projects);
136+
for (const auto& alias : aliases)
137+
{
138+
if (options.isImageMagick7)
139+
createUtilityProject(utilitiesProject,alias,L"magick",projects);
140+
else
141+
createUtilityProject(utilitiesProject,alias,alias,projects);
142+
}
140143
}
141144

142145
if (options.isImageMagick7)

0 commit comments

Comments
 (0)