[llvm-commits] [llvm] r56453 - in /llvm/trunk: CMakeLists.txt cmake/modules/AddLLVM.cmake cmake/modules/AddPartiallyLinkedObject.cmake lib/Target/X86/AsmPrinter/CMakeLists.txt lib/Target/X86/CMakeLists.txt tools/llvm-config/CMakeLists.txt
Oscar Fuentes
ofv at wanadoo.es
Mon Sep 22 11:21:51 PDT 2008
Author: ofv
Date: Mon Sep 22 13:21:51 2008
New Revision: 56453
URL: http://llvm.org/viewvc/llvm-project?rev=56453&view=rev
Log:
CMake build system: support for parallel builds.
Modified:
llvm/trunk/CMakeLists.txt
llvm/trunk/cmake/modules/AddLLVM.cmake
llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake
llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt
llvm/trunk/lib/Target/X86/CMakeLists.txt
llvm/trunk/tools/llvm-config/CMakeLists.txt
Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -97,6 +97,10 @@
add_subdirectory(lib/Support)
add_subdirectory(lib/System)
+
+# Everything else depends on Support and System:
+set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} ${LLVM_LIBS} )
+
add_subdirectory(utils/TableGen)
add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen
@@ -107,6 +111,8 @@
add_custom_target(intrinsics_gen ALL
DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen)
+set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} intrinsics_gen )
+
add_subdirectory(lib/VMCore)
add_subdirectory(lib/CodeGen)
add_subdirectory(lib/CodeGen/SelectionDAG)
Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=56453&r1=56452&r2=56453&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Mon Sep 22 13:21:51 2008
@@ -3,6 +3,10 @@
macro(add_llvm_library name)
add_library( ${name} ${ARGN} )
set( llvm_libs ${llvm_libs} ${name} PARENT_SCOPE)
+ set( llvm_lib_targets ${llvm_lib_targets} ${name} PARENT_SCOPE )
+ if( LLVM_COMMON_DEPENDS )
+ add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
+ endif( LLVM_COMMON_DEPENDS )
endmacro(add_llvm_library name)
Modified: llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake?rev=56453&r1=56452&r2=56453&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake (original)
+++ llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake Mon Sep 22 13:21:51 2008
@@ -1,4 +1,13 @@
+macro(target_name_of_partially_linked_object lib var)
+ if( MSVC )
+ set(${var} ${lib})
+ else( MSVC )
+ set(${var} ${lib}_pll)
+ endif( MSVC )
+endmacro(target_name_of_partially_linked_object lib var)
+
+
macro(add_partially_linked_object lib)
if( MSVC )
add_llvm_library( ${lib} ${ARGN})
@@ -7,6 +16,9 @@
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
add_library( ${lib} STATIC ${ARGN})
+ if( LLVM_COMMON_DEPENDS )
+ add_dependencies( ${lib} ${LLVM_COMMON_DEPENDS} )
+ endif( LLVM_COMMON_DEPENDS )
add_custom_command(OUTPUT ${pll}
COMMENT "Building ${lib}.o..."
DEPENDS ${lib}
@@ -15,7 +27,9 @@
COMMAND ld -r *${CMAKE_CXX_OUTPUT_EXTENSION} -o ${pll}
COMMAND rm -f *${CMAKE_CXX_OUTPUT_EXTENSION}
)
- add_custom_target(${lib}_pll ALL DEPENDS ${pll})
+ target_name_of_partially_linked_object(${lib} tnplo)
+ add_custom_target(${tnplo} ALL DEPENDS ${pll})
set( llvm_libs ${llvm_libs} ${pll} PARENT_SCOPE)
+ set( llvm_lib_targets ${llvm_lib_targets} ${tnplo} PARENT_SCOPE )
endif( MSVC )
endmacro(add_partially_linked_object lib)
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -5,3 +5,7 @@
X86AsmPrinter.cpp
X86IntelAsmPrinter.cpp
)
+
+target_name_of_partially_linked_object(LLVMX86CodeGen n)
+
+add_dependencies(LLVMX86AsmPrinter ${n})
Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -20,7 +20,6 @@
add_custom_target(X86Table_gen echo Tablegenning
DEPENDS
- ${llvm_builded_incs_dir}/Intrinsics.gen
${CMAKE_CURRENT_BINARY_DIR}/X86GenRegisterInfo.h.inc
${CMAKE_CURRENT_BINARY_DIR}/X86GenRegisterNames.inc
${CMAKE_CURRENT_BINARY_DIR}/X86GenRegisterInfo.inc
@@ -34,6 +33,8 @@
${CMAKE_CURRENT_BINARY_DIR}/X86GenSubtarget.inc
)
+add_dependencies(X86Table_gen ${LLVM_COMMON_DEPENDS})
+
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
add_partially_linked_object(LLVMX86CodeGen
Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -69,7 +69,6 @@
add_custom_command(OUTPUT ${LIBDEPS_TMP}
COMMAND ${PERL_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/GenLibDeps.pl -flat ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} > ${LIBDEPS_TMP}
- DEPENDS ${llvm_libs}
COMMENT "Regenerating ${LIBDEPS_TMP}")
add_custom_command(OUTPUT ${LIBDEPS}
@@ -99,4 +98,6 @@
)
add_custom_target(llvm-config.target ALL
- DEPENDS ${LLVM_CONFIG})
\ No newline at end of file
+ DEPENDS ${LLVM_CONFIG})
+
+add_dependencies(llvm-config.target ${llvm_lib_targets})
More information about the llvm-commits
mailing list