diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-11 12:15:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-15 15:43:50 (GMT) |
| commit | 5d056c0dd85934e7a985cb49f97c343e38f20929 (patch) | |
| tree | b3a091e3886ba1de176fcfac7d93075a01310e22 /Source/cmQtAutoGenerators.cxx | |
| parent | de722d7d63866613aaa8105b52ee90ffe2721136 (diff) | |
| download | CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.zip CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.tar.gz CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.tar.bz2 | |
Port Global property interaction to cmState.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 4cb49c8..4d0b3f4 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -16,6 +16,7 @@ #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmSystemTools.h" +#include "cmState.h" #include "cmAlgorithms.h" #if defined(_WIN32) && !defined(__CYGWIN__) @@ -472,12 +473,12 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target) } // Set target folder - const char* autogenFolder = makefile->GetCMakeInstance()->GetProperty( - "AUTOMOC_TARGETS_FOLDER"); + const char* autogenFolder = makefile->GetState() + ->GetGlobalProperty("AUTOMOC_TARGETS_FOLDER"); if (!autogenFolder) { - autogenFolder = makefile->GetCMakeInstance()->GetProperty( - "AUTOGEN_TARGETS_FOLDER"); + autogenFolder = makefile->GetState() + ->GetGlobalProperty("AUTOGEN_TARGETS_FOLDER"); } if (autogenFolder && *autogenFolder) { |