diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-22 13:41:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-22 13:41:30 (GMT) |
| commit | 1744ad9257c3b9fc5badc31d746acd8d2fa30f9e (patch) | |
| tree | 62471abb61d4018627ec4dc01a3ede59ddc3c90b /Source/cmGeneratorExpressionDAGChecker.cxx | |
| parent | d121a8cb66c7f610c57aa6447f7671a5dd4a8730 (diff) | |
| parent | 4fe963f656c48b1f2fd0b4a2f427bb376f619c37 (diff) | |
| download | CMake-1744ad9257c3b9fc5badc31d746acd8d2fa30f9e.zip CMake-1744ad9257c3b9fc5badc31d746acd8d2fa30f9e.tar.gz CMake-1744ad9257c3b9fc5badc31d746acd8d2fa30f9e.tar.bz2 | |
Merge topic 'add-cmHasLiteralPrefix'
4fe963f Use new cmHasLiteralPrefix function
7d4b2b2 cmStandardIncludes: Add new cmHasLiteralPrefix function.
Diffstat (limited to 'Source/cmGeneratorExpressionDAGChecker.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index 92dc054..7399c7b 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -173,8 +173,8 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries(const char *tgt) return (strcmp(prop, "LINK_LIBRARIES") == 0 || strcmp(prop, "LINK_INTERFACE_LIBRARIES") == 0 || strcmp(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES") == 0 - || strncmp(prop, "LINK_INTERFACE_LIBRARIES_", 25) == 0 - || strncmp(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES_", 34) == 0) + || cmHasLiteralPrefix(prop, "LINK_INTERFACE_LIBRARIES_") + || cmHasLiteralPrefix(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES_")) || strcmp(prop, "INTERFACE_LINK_LIBRARIES") == 0; } @@ -200,7 +200,7 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingCompileDefinitions() const const char *prop = this->Property.c_str(); return (strcmp(prop, "COMPILE_DEFINITIONS") == 0 || strcmp(prop, "INTERFACE_COMPILE_DEFINITIONS") == 0 - || strncmp(prop, "COMPILE_DEFINITIONS_", 20) == 0); + || cmHasLiteralPrefix(prop, "COMPILE_DEFINITIONS_")); } //---------------------------------------------------------------------------- |