[objcopy][NFC] Add rules to cmake to put files under specific folders.

[avl]

Summary

This patch adds rules to cmake to put files under specific folders.

It allows to have files for different formats(which are located in different
subdirectories) be displayed in different subfolders of VS IDE solution.

Depends on D114429

[jhenderson]

llvm/lib/Object/CMakeLists.txt

1 ↗

(On Diff #390144)

Nit: delete this blank line.

2 ↗

(On Diff #390144)

The backslashes are surprising to me. Can this be forward slashes, like a cross-platform file path?

3 ↗

(On Diff #390144)

I think you want to use the REGULAR_EXPRESSION rather than FILES, so that you don't need to explicitly specify each source file in the list.

This should allow you to avoid the need for the macros below too.

107–110 ↗

(On Diff #390144)

Do you need these explicitly?

[avl]

llvm/lib/Object/CMakeLists.txt

2 ↗

(On Diff #390144)

If forward slashes are used then Visual Studio shows "ObjCopy" not as subfolder of "Header Files" but as another folder on the same level as "Header Files".

[avl]

addressed comments.

[avl]

llvm/lib/Object/CMakeLists.txt

107–110 ↗

(On Diff #390144)

yes, we need these. If we do not specify include paths here then corresponding .h files would not be shown in the "Header Files" folder.

[jhenderson]

LGTM.

llvm/lib/Object/CMakeLists.txt

2 ↗

(On Diff #390144)

That's bizarre, but okay.

107–110 ↗

(On Diff #390144)

Interesting. That suggests the add_llvm_component_library function doesn't recurse down the tree, which it intuitively should (possibly auto-adding the source groups along the way). Anyway, not an issue with this patch.

[avl]

rebased.

[jhenderson]

Thanks, much appreciated. LGTM again!

llvm/lib/ObjCopy/CMakeLists.txt

+source_group("Header Files" REGULAR_EXPRESSION
+  .*[.]h
+)
+source_group("Header Files\\COFF" REGULAR_EXPRESSION
+  COFF/.*[.]h
+)
+source_group("Header Files\\ELF" REGULAR_EXPRESSION
+  ELF/.*[.]h
+)
+source_group("Header Files\\MachO" REGULAR_EXPRESSION
+  MachO/.*[.]h
+)
+source_group("Header Files\\wasm" REGULAR_EXPRESSION
+  wasm/.*[.]h
+)
+source_group("Source Files" REGULAR_EXPRESSION
+  .*[.]cpp
+)
+source_group("Source Files\\COFF" REGULAR_EXPRESSION  
+  COFF/.*[.]cpp
+)
+source_group("Source Files\\ELF" REGULAR_EXPRESSION
+  ELF/.*[.]cpp
+)
+source_group("Source Files\\MachO" REGULAR_EXPRESSION
+  MachO/.*[.]cpp
+)
+source_group("Source Files\\wasm" REGULAR_EXPRESSION
+  wasm/.*[.]cpp
+)
+
 add_llvm_component_library(LLVMObjCopy
   Archive.cpp
   ObjCopy.cpp
   ConfigManager.cpp
   COFF/COFFObjcopy.cpp
   COFF/Object.cpp
   COFF/Reader.cpp
   COFF/Writer.cpp
   ELF/ELFObjcopy.cpp
   ELF/Object.cpp
   MachO/MachOObjcopy.cpp
   MachO/MachOReader.cpp
   MachO/MachOWriter.cpp
   MachO/MachOLayoutBuilder.cpp
   MachO/Object.cpp
   wasm/Object.cpp
   wasm/Reader.cpp
   wasm/Writer.cpp
   wasm/WasmObjcopy.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/COFF
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/ELF
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/MachO
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/wasm
+  COFF
+  ELF
+  MachO
+  wasm
   
   DEPENDS
   intrinsics_gen
 
   LINK_COMPONENTS
   Object
   Support
   MC
   )