CMake: Adds header and TableGen files to Visual Studio solution. A new

dummy library, `llvm_headers_do_not_build', is created for containing
all header and TableGen files under include/llvm.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59346 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index d8fd08b473b7c3af17711c08e8a88422f61b4406..85e6230f90f487700c9c5be4d5d87b4a211dc69e 100755 (executable)
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -2,8 +2,8 @@ include(LLVMProcessSources)
 include(LLVMConfig)
 
 macro(add_llvm_library name)
-  llvm_process_sources( ${ARGN} )
-  add_library( ${name} ${ARGN} )
+  llvm_process_sources( ALL_FILES ${ARGN} )
+  add_library( ${name} ${ALL_FILES} )
   set( llvm_libs ${llvm_libs} ${name} PARENT_SCOPE)
   set( llvm_lib_targets ${llvm_lib_targets} ${name} PARENT_SCOPE )
   if( LLVM_COMMON_DEPENDS )
@@ -16,8 +16,8 @@ endmacro(add_llvm_library name)
 
 
 macro(add_llvm_executable name)
-  llvm_process_sources( ${ARGN} )
-  add_executable(${name} ${ARGN})
+  llvm_process_sources( ALL_FILES ${ARGN} )
+  add_executable(${name} ${ALL_FILES})
   if( LLVM_USED_LIBS )
     foreach(lib ${LLVM_USED_LIBS})
       target_link_libraries( ${name} ${lib} )

diff --git a/cmake/modules/AddPartiallyLinkedObject.cmake b/cmake/modules/AddPartiallyLinkedObject.cmake
index 001bcdc6a5a6d5837711e773cbc8c16b094a7d37..c23a665956cf91566f86e569913c8db759d0d58b 100755 (executable)
--- a/cmake/modules/AddPartiallyLinkedObject.cmake
+++ b/cmake/modules/AddPartiallyLinkedObject.cmake
@@ -16,8 +16,8 @@ macro(add_partially_linked_object lib)
     set(pll ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${lib}.o)
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
-    llvm_process_sources( ${ARGN} )
-    add_library( ${lib} STATIC ${ARGN})
+    llvm_process_sources( ALL_FILES ${ARGN} )
+    add_library( ${lib} STATIC ${ALL_FILES})
     if( LLVM_COMMON_DEPENDS )
       add_dependencies( ${lib} ${LLVM_COMMON_DEPENDS} )
     endif( LLVM_COMMON_DEPENDS )

diff --git a/cmake/modules/LLVMProcessSources.cmake b/cmake/modules/LLVMProcessSources.cmake
index 0dad3fb7405f92c4a62041edd55d215eae103b26..12a8968c724b94174e1de84aaad4cdaee001d370 100644 (file)
--- a/cmake/modules/LLVMProcessSources.cmake
+++ b/cmake/modules/LLVMProcessSources.cmake
@@ -1,6 +1,26 @@
 include(AddFileDependencies)
 
-function(llvm_process_sources)
+
+macro(add_td_sources srcs)
+  file(GLOB tds *.td)
+  if( tds )
+    source_group("TableGen descriptions" FILES ${tds})
+    set_source_files_properties(${tds} PROPERTIES HEADER_FILE_ONLY ON)
+    list(APPEND ${srcs} ${tds})
+  endif()
+endmacro(add_td_sources)
+
+
+macro(add_header_files srcs)
+  file(GLOB hds *.h)
+  if( hds )
+    set_source_files_properties(${hds} PROPERTIES HEADER_FILE_ONLY ON)
+    list(APPEND ${srcs} ${hds})
+  endif()
+endmacro(add_header_files)
+
+
+function(llvm_process_sources OUT_VAR)
   set( sources ${ARGN} )
   # Create file dependencies on the tablegenned files, if any.  Seems
   # that this is not strictly needed, as dependencies of the .cpp
@@ -10,4 +30,10 @@ function(llvm_process_sources)
     set( f ${CMAKE_CURRENT_SOURCE_DIR}/${s} )
     add_file_dependencies( ${f} ${TABLEGEN_OUTPUT} )
   endforeach(s)
+  if( MSVC_IDE )
+    # This adds .td and .h files to the Visual Studio solution:
+    add_td_sources(sources)
+    add_header_files(sources)
+  endif()
+  set( ${OUT_VAR} ${sources} PARENT_SCOPE )
 endfunction(llvm_process_sources)

diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt
index 523f231277894cf66f0ace440ed9c0fcbbe8cdea..ab5f5b7de7599b35c3081644e1e6684a6597ecab 100644 (file)
--- a/include/llvm/CMakeLists.txt
+++ b/include/llvm/CMakeLists.txt
@@ -6,3 +6,14 @@ add_custom_target(intrinsics_gen ALL
   DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen)
 
 set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} intrinsics_gen PARENT_SCOPE)
+
+if( MSVC_IDE )
+  # Creates a dummy target containing all headers for the benefit of
+  # Visual Studio users.
+  file(GLOB_RECURSE headers *.h)
+  add_td_sources(headers)
+  add_library(llvm_headers_do_not_build EXCLUDE_FROM_ALL
+    # We need at least one source file:
+    ${LLVM_MAIN_SRC_DIR}/lib/Transforms/Hello/Hello.cpp
+    ${headers})
+endif()