[CMake] Setup include dirs properly.

llvm-svn: 173488

diff --git a/lld/lib/ReaderWriter/ELF/CMakeLists.txt b/lld/lib/ReaderWriter/ELF/CMakeLists.txt
index cbbffd7..ba10c66 100644 (file)
--- a/lld/lib/ReaderWriter/ELF/CMakeLists.txt
+++ b/lld/lib/ReaderWriter/ELF/CMakeLists.txt
@@ -1,21 +1,3 @@
-file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
-
-foreach(dir ${all_valid_subdirs})
-    message(STATUS "AUTOADD ELFTarget = ${dir}")
-    if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
-        string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
-        include_directories(AFTER 
-                            ${CMAKE_CURRENT_SOURCE_DIR}/${dir_trimmed})
-    endif()
-endforeach(dir)
-
-foreach(dir ${all_valid_subdirs})
-    if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
-        string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
-        add_subdirectory(${dir_trimmed})
-    endif()
-endforeach(dir)
-
 add_lld_library(lldELF
   ELFTargetInfo.cpp
   HexagonReference.cpp
@@ -29,4 +11,16 @@ add_lld_library(lldELF
 
 target_link_libraries(lldELF
   lldReaderWriter
+  lldX86_64ELFTarget
   )
+
+include_directories(.)
+
+file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
+
+foreach(dir ${all_valid_subdirs})
+    if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
+        string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
+        add_subdirectory(${dir_trimmed})
+    endif()
+endforeach(dir)

diff --git a/lld/lib/ReaderWriter/ELF/ELFTargets.h b/lld/lib/ReaderWriter/ELF/ELFTargets.h
index 6ab1c1e..bbf85cc 100644 (file)
--- a/lld/lib/ReaderWriter/ELF/ELFTargets.h
+++ b/lld/lib/ReaderWriter/ELF/ELFTargets.h
@@ -9,9 +9,9 @@
 #ifndef LLD_READER_WRITER_ELF_TARGETS_H
 #define LLD_READER_WRITER_ELF_TARGETS_H
 
-#include "X86ELFTarget.h"
-#include "X86_64ELFTarget.h"
-#include "HexagonELFTarget.h"
-#include "PPCELFTarget.h"
+#include "X86/X86ELFTarget.h"
+#include "X86_64/X86_64ELFTarget.h"
+#include "Hexagon/HexagonELFTarget.h"
+#include "PPC/PPCELFTarget.h"
 
 #endif

diff --git a/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt b/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt
index c2f7757..8beccc7 100644 (file)
--- a/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt
+++ b/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt
@@ -1,5 +1,3 @@
 add_lld_library(lldX86_64ELFTarget
   X86_64TargetInfo.cpp
   )
-
-target_link_libraries(lldX86_64ELFTarget)