Permalink
Browse files

Merge branch '10-support-builtin-additional-settings'

* 10-support-builtin-additional-settings:
  Environment can be displayed without having a valid application path
  • Loading branch information...
2 parents d4a540c + f3509ce commit c2ded8170af6c6e6da85e833795cf1f271c39bbf @jcfr jcfr committed Dec 3, 2012
Showing with 6 additions and 6 deletions.
  1. +5 −5 Base/ctkAppLauncher.cpp
  2. +1 −1 Testing/CMake/AppLauncher-Param-TestLauncherDumpEnvironment.cmake
View
@@ -978,17 +978,17 @@ int ctkAppLauncher::processArguments()
return Self::ExitWithError;
}
- if (!this->Internal->processApplicationToLaunchArgument())
- {
- return Self::ExitWithError;
- }
-
if (this->Internal->ParsedArgs.value("launcher-dump-environment").toBool())
{
this->displayEnvironment();
return Self::ExitWithSuccess;
}
+ if (!this->Internal->processApplicationToLaunchArgument())
+ {
+ return Self::ExitWithError;
+ }
+
return Self::Continue;
}
@@ -17,7 +17,7 @@ set(env_var_name_2 "SOMETHING_AWESOME")
set(env_var_value_2 "Rock climbing !")
file(WRITE "${launcher}LauncherSettings.ini" "
[Application]
-path=${application}
+path=
[LibraryPaths]
1\\path=${library_path}

0 comments on commit c2ded81

Please sign in to comment.