Merge topic 'xcode-revert-header-map'

841272eb35 Xcode: Restore suppression of header maps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8218

Source/cmGlobalXCodeGenerator.cxx

@@ -2974,6 +2974,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   buildSettings->AddAttribute("SECTORDER_FLAGS", this->CreateString(""));
   buildSettings->AddAttribute("ALWAYS_SEARCH_USER_PATHS",
                               this->CreateString("NO"));
+  buildSettings->AddAttribute("USE_HEADERMAP", this->CreateString("NO"));
   cmXCodeObject* group = this->CreateObject(cmXCodeObject::OBJECT_LIST);
   group->AddObject(this->CreateString("$(inherited)"));
   buildSettings->AddAttribute("WARNING_CFLAGS", group);

Tests/CMakeCommands/target_include_directories/CMakeLists.txt

@@ -83,3 +83,8 @@ get_target_property(_res imp INCLUDE_DIRECTORIES)
 if (_res)
   message(SEND_ERROR "include_directories populated the INCLUDE_DIRECTORIES target property")
 endif()
+
+# Test selecting lexicographically-later header of same name via include order.
+# Xcode 'USE_HEADERMAP = YES' breaks this.
+add_library(same STATIC same.c same_one/same.h same_two/same.h)
+target_include_directories(same PRIVATE same_two)

Tests/CMakeCommands/target_include_directories/same.c

@@ -0,0 +1,7 @@
+#include "same.h"
+#ifndef CORRECT_SAME_H_INCLUDED
+#  error "Correct \"same.h\" not included!"
+#endif
+void same(void)
+{
+}

Tests/CMakeCommands/target_include_directories/same_one/same.h

@@ -0,0 +1 @@
+#error "Wrong \"same.h\" included!"

Tests/CMakeCommands/target_include_directories/same_two/same.h

@@ -0,0 +1 @@
+#define CORRECT_SAME_H_INCLUDED