4 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 6511510..7870564 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -349,7 +349,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     cmMakefile *makefile = depender->GetMakefile();
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     bool issueMessage = false;
-    switch(makefile->GetPolicyStatus(cmPolicies::CMP0046))
+    switch(depender->GetPolicyStatusCMP0046())
       {
       case cmPolicies::WARN:
         issueMessage = true;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index db34bd8..84a9a7c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1730,7 +1730,7 @@ static void processIncludeDirectories(cmTarget const* tgt,
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         if (fromEvaluatedImported)
           {
-          switch(mf->GetPolicyStatus(cmPolicies::CMP0027))
+          switch(tgt->GetPolicyStatusCMP0027())
             {
             case cmPolicies::WARN:
               e << (mf->GetPolicies()
@@ -5662,7 +5662,7 @@ void cmTarget::ComputeLinkImplementation(const char* config,
         bool noMessage = false;
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         cmOStringStream e;
-        switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0038))
+        switch(this->GetPolicyStatusCMP0038())
           {
           case cmPolicies::WARN:
             {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 271824b..0e9d682 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -26,8 +26,11 @@
   F(CMP0020) \
   F(CMP0021) \
   F(CMP0022) \
+  F(CMP0027) \
+  F(CMP0038) \
   F(CMP0041) \
-  F(CMP0042)
+  F(CMP0042) \
+  F(CMP0046)
 
 class cmake;
 class cmMakefile;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 33fb0fc..abbabe7 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -653,7 +653,7 @@ void cmake::SetArgs(const std::vector<std::string>& args,
       cmSystemTools::ConvertToUnixSlashes(path);
       this->SetHomeOutputDirectory(path.c_str());
       }
-    else if((i < args.size()-1) && (arg.find("--check-build-system",0) == 0))
+    else if((i < args.size()-2) && (arg.find("--check-build-system",0) == 0))
       {
       this->CheckBuildSystemArgument = args[++i];
       this->ClearBuildSystem = (atoi(args[++i].c_str()) > 0);