diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-07 14:34:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-07 14:34:50 (GMT) |
| commit | 947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6 (patch) | |
| tree | febc2c50a0007b5081398e354de5b7d285c7a29c /Source | |
| parent | a023a2e4fe289dedd42a883464c9f7514ac0d0e9 (diff) | |
| parent | 3ded5b6da8cb10d855e36d4ea534222ba870d165 (diff) | |
| download | CMake-947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6.zip CMake-947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6.tar.gz CMake-947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6.tar.bz2 | |
Merge topic 'export-genex-under-prefix'
3ded5b6da8 install,export: Fix export of a genex following $<INSTALL_PREFIX>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3886
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index b968537..3d7eccc 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -216,6 +216,9 @@ static bool checkInterfaceDirs(const std::string& prepro, if (genexPos == 0) { continue; } + if (cmHasLiteralPrefix(li, "${_IMPORT_PREFIX}")) { + continue; + } MessageType messageType = MessageType::FATAL_ERROR; std::ostringstream e; if (genexPos != std::string::npos) { @@ -237,9 +240,6 @@ static bool checkInterfaceDirs(const std::string& prepro, hadFatalError = true; } } - if (cmHasLiteralPrefix(li, "${_IMPORT_PREFIX}")) { - continue; - } if (!cmSystemTools::FileIsFullPath(li)) { /* clang-format off */ e << "Target \"" << target->GetName() << "\" " << prop << |