diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2008-11-15 02:08:08 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2008-11-15 02:08:08 +0000 |
| commit | 50925fbed4ea28296517b92e186d49ddb8535515 (patch) | |
| tree | d8a9ab1c77a7278441e667fa58962ff9437111ac /cmake | |
| parent | 7e2cc91d2dfae04014d817efe7f3f071ce97f452 (diff) | |
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
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/modules/AddLLVM.cmake | 8 | ||||
| -rwxr-xr-x | cmake/modules/AddPartiallyLinkedObject.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/LLVMProcessSources.cmake | 28 |
3 files changed, 33 insertions, 7 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index d8fd08b473..85e6230f90 100755 --- 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 001bcdc6a5..c23a665956 100755 --- 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 0dad3fb740..12a8968c72 100644 --- 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) |