[llvm-commits] [llvm] r59346 - in /llvm/trunk: cmake/modules/AddLLVM.cmake cmake/modules/AddPartiallyLinkedObject.cmake cmake/modules/LLVMProcessSources.cmake include/llvm/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Fri Nov 14 20:08:08 2008
New Revision: 59346

URL: http://llvm.org/viewvc/llvm-project?rev=59346&view=rev
Log:
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.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake
    llvm/trunk/cmake/modules/LLVMProcessSources.cmake
    llvm/trunk/include/llvm/CMakeLists.txt

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=59346&r1=59345&r2=59346&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Fri Nov 14 20:08:08 2008
@@ -2,8 +2,8 @@
 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 @@
 
 
 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} )

Modified: llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake?rev=59346&r1=59345&r2=59346&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake (original)
+++ llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake Fri Nov 14 20:08:08 2008
@@ -16,8 +16,8 @@
     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 )

Modified: llvm/trunk/cmake/modules/LLVMProcessSources.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMProcessSources.cmake?rev=59346&r1=59345&r2=59346&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/LLVMProcessSources.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMProcessSources.cmake Fri Nov 14 20:08:08 2008
@@ -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 @@
     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)

Modified: llvm/trunk/include/llvm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CMakeLists.txt?rev=59346&r1=59345&r2=59346&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CMakeLists.txt (original)
+++ llvm/trunk/include/llvm/CMakeLists.txt Fri Nov 14 20:08:08 2008
@@ -6,3 +6,14 @@
   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()