[llvm-commits] [llvm] r67056 - in /llvm/trunk: cmake/modules/AddPartiallyLinkedObject.cmake cmake/modules/LLVMConfig.cmake tools/llvm-config/CMakeLists.txt

[Douglas Gregor]

Author: dgregor
Date: Mon Mar 16 17:53:26 2009
New Revision: 67056

URL: http://llvm.org/viewvc/llvm-project?rev=67056&view=rev
Log:
CMake: Build system fixes for XCode. llvm-config still causes us some serious trouble, but it's less serious than it used to be

Modified:
    llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake
    llvm/trunk/cmake/modules/LLVMConfig.cmake
    llvm/trunk/tools/llvm-config/CMakeLists.txt

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

==============================================================================
--- llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake (original)
+++ llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake Mon Mar 16 17:53:26 2009
@@ -13,7 +13,7 @@
   if( MSVC )
     add_llvm_library( ${lib} ${ARGN})
   else( MSVC )
-    set(pll ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${lib}.o)
+    set(pll ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${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( ALL_FILES ${ARGN} )
@@ -27,7 +27,7 @@
     add_custom_command(OUTPUT ${pll}
       COMMENT "Building ${lib}.o..."
       DEPENDS ${lib}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib/${CMAKE_CFG_INTDIR}
       COMMAND ar x ${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}
       COMMAND ${CMAKE_LINKER} "${LLVM_PLO_FLAGS}" -r "*${CMAKE_CXX_OUTPUT_EXTENSION}" -o ${pll}
       COMMAND ${CMAKE_COMMAND} -E remove -f *${CMAKE_CXX_OUTPUT_EXTENSION}

Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMConfig.cmake?rev=67056&r1=67055&r2=67056&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/LLVMConfig.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMConfig.cmake Mon Mar 16 17:53:26 2009
@@ -131,7 +131,7 @@
       if(c MATCHES ".*\\.o")
 	get_filename_component(fn ${c} NAME)
 	target_link_libraries(${executable}
-	  ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${fn})
+	  ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${fn})
       else(c MATCHES ".*\\.o")
 	string(REPLACE "-l" "" fn ${c})
 	target_link_libraries(${executable} ${fn})

Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=67056&r1=67055&r2=67056&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Mon Mar 16 17:53:26 2009
@@ -68,7 +68,7 @@
 endif()
 
 add_custom_command(OUTPUT ${LIBDEPS_TMP}
-  COMMAND ${PERL_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/GenLibDeps.pl -flat ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} ${NM_PATH} > ${LIBDEPS_TMP}
+  COMMAND ${PERL_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/GenLibDeps.pl -flat ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} ${NM_PATH} > ${LIBDEPS_TMP}
   DEPENDS ${llvm_libs}
   COMMENT "Regenerating ${LIBDEPS_TMP}")