diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-30 13:29:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-30 13:29:43 (GMT) |
| commit | 388a40942bbe87206547bd9eb27273f80ef2aa9f (patch) | |
| tree | d8218e3a1993f0f77395287b7bc176085694647e | |
| parent | 918cb5b1f095cc05a8823fa218a59edf0e536384 (diff) | |
| parent | 38995d19b806e8cc1d43fab0422beefd4c23431f (diff) | |
| download | CMake-388a40942bbe87206547bd9eb27273f80ef2aa9f.zip CMake-388a40942bbe87206547bd9eb27273f80ef2aa9f.tar.gz CMake-388a40942bbe87206547bd9eb27273f80ef2aa9f.tar.bz2 | |
Merge topic 'code-blocks-include-order'
38995d19 CodeBlocks: List C++ includes first
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 559974e..6eae26b 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -593,7 +593,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget( includes.end()); std::string systemIncludeDirs = makefile->GetSafeDefinition( - "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); + "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS"); if (!systemIncludeDirs.empty()) { std::vector<std::string> dirs; cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); @@ -601,7 +601,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget( } systemIncludeDirs = makefile->GetSafeDefinition( - "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS"); + "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); if (!systemIncludeDirs.empty()) { std::vector<std::string> dirs; cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); |