|
|
@@ -985,19 +985,18 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(
|
|
|
/* clang-format off */
|
|
|
os << "# Protect against multiple inclusion, which would fail when already "
|
|
|
"imported targets are added once more.\n"
|
|
|
- "set(_cmake_targets_defined)\n"
|
|
|
- "set(_cmake_targets_not_defined)\n"
|
|
|
- "set(_cmake_expected_targets)\n"
|
|
|
+ "set(_cmake_targets_defined \"\")\n"
|
|
|
+ "set(_cmake_targets_not_defined \"\")\n"
|
|
|
+ "set(_cmake_expected_targets \"\")\n"
|
|
|
"foreach(_cmake_expected_target " << expectedTargets << ")\n"
|
|
|
" list(APPEND _cmake_expected_targets ${_cmake_expected_target})\n"
|
|
|
- " if(NOT TARGET ${_cmake_expected_target})\n"
|
|
|
- " list(APPEND _cmake_targets_not_defined ${_cmake_expected_target})\n"
|
|
|
- " endif()\n"
|
|
|
" if(TARGET ${_cmake_expected_target})\n"
|
|
|
" list(APPEND _cmake_targets_defined ${_cmake_expected_target})\n"
|
|
|
+ " else()\n"
|
|
|
+ " list(APPEND _cmake_targets_not_defined ${_cmake_expected_target})\n"
|
|
|
" endif()\n"
|
|
|
"endforeach()\n"
|
|
|
- "if(\"${_cmake_targets_defined}\" STREQUAL \"${_cmake_expected_targets}\")\n"
|
|
|
+ "if(_cmake_targets_defined STREQUAL _cmake_expected_targets)\n"
|
|
|
" unset(_cmake_targets_defined)\n"
|
|
|
" unset(_cmake_targets_not_defined)\n"
|
|
|
" unset(_cmake_expected_targets)\n"
|
|
|
@@ -1005,7 +1004,7 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(
|
|
|
" cmake_policy(POP)\n"
|
|
|
" return()\n"
|
|
|
"endif()\n"
|
|
|
- "if(NOT \"${_cmake_targets_defined}\" STREQUAL \"\")\n"
|
|
|
+ "if(NOT _cmake_targets_defined STREQUAL \"\")\n"
|
|
|
" message(FATAL_ERROR \"Some (but not all) targets in this export "
|
|
|
"set were already defined.\\nTargets Defined: ${_cmake_targets_defined}\\n"
|
|
|
"Targets not yet defined: ${_cmake_targets_not_defined}\\n\")\n"
|