diff options
| author | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2017-04-21 18:54:50 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-04-26 06:59:57 (GMT) |
| commit | 9a740f1b595c7e68aa4670745097d2ca907513b9 (patch) | |
| tree | 7d7ba548dc7c1a0588435994fd94b7bc0b336926 | |
| parent | a168b4ccc2b479d32455d7bb63c97a9a9d4dee68 (diff) | |
| download | CMake-9a740f1b595c7e68aa4670745097d2ca907513b9.zip CMake-9a740f1b595c7e68aa4670745097d2ca907513b9.tar.gz CMake-9a740f1b595c7e68aa4670745097d2ca907513b9.tar.bz2 | |
cmCPackIFWInstaller: fix validation of WizardStyle option
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWInstaller.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 664048d..5e5f066 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -171,16 +171,17 @@ void cmCPackIFWInstaller::ConfigureFromOptions() // WizardStyle if (const char* option = GetOption("CPACK_IFW_PACKAGE_WIZARD_STYLE")) { - if (WizardStyle == "Modern" && WizardStyle == "Aero" && - WizardStyle == "Mac" && WizardStyle == "Classic") { + // Setting the user value in any case + WizardStyle = option; + // Check known values + if (WizardStyle != "Modern" && WizardStyle != "Aero" && + WizardStyle != "Mac" && WizardStyle != "Classic") { cmCPackLogger( cmCPackLog::LOG_WARNING, "Option CPACK_IFW_PACKAGE_WIZARD_STYLE has unknown value \"" << option << "\". Expected values are: Modern, Aero, Mac, Classic." << std::endl); } - - WizardStyle = option; } // WizardDefaultWidth |