@@ -217,7 +217,8 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
}
else if(arg.find("-P",0) == 0)
{
- std::string path = arg.substr(strlen("-P"));
+ i++;
+ std::string path = args[i];
if ( path.size() == 0 )
cmSystemTools::Error("No cmake scrpt provided.");
@@ -185,8 +185,14 @@ int do_cmake(int ac, char** av)
else if (strncmp(av[i], "-P", strlen("-P")) == 0)
+ if ( i == ac -1 )
+ {
+ cmSystemTools::Error("No script specified for argument -P");
+ }
script_mode = true;
args.push_back(av[i]);
+ args.push_back(av[i]);
else
@@ -71,7 +71,7 @@ ADD_CUSTOM_COMMAND(
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS ${EXTRA_INSTALL_FLAGS}
- "-P${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake"
COMMENT "Install Project"
)