[llvm-commits] [llvm] r130199 - in /llvm/trunk: cmake/modules/AddLLVM.cmake runtime/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Tue Apr 26 09:55:27 2011
New Revision: 130199

URL: http://llvm.org/viewvc/llvm-project?rev=130199&view=rev
Log:
Honor LLVM_BUILD_RUNTIME.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/runtime/CMakeLists.txt

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=130199&r1=130198&r2=130199&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Tue Apr 26 09:55:27 2011
@@ -57,9 +57,13 @@
         LINK_FLAGS "-Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
     endif()
 
-    install(TARGETS ${name}
-      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+    if( EXCLUDE_FROM_ALL )
+      set_target_properties(profile_rt PROPERTIES EXCLUDE_FROM_ALL ON)
+    else()
+      install(TARGETS ${name}
+	LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+	ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+    endif()
   endif()
 
   set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")

Modified: llvm/trunk/runtime/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtime/CMakeLists.txt?rev=130199&r1=130198&r2=130199&view=diff
==============================================================================
--- llvm/trunk/runtime/CMakeLists.txt (original)
+++ llvm/trunk/runtime/CMakeLists.txt Tue Apr 26 09:55:27 2011
@@ -1 +1,5 @@
+if( NOT LLVM_BUILD_RUNTIME )
+  set(EXCLUDE_FROM_ALL ON)
+endif()
+
 add_subdirectory(libprofile)