[llvm-commits] [compiler-rt] r162546 - in /compiler-rt/trunk/lib: CMakeLists.txt asan/CMakeLists.txt

[Alexander Potapenko]

Author: glider
Date: Fri Aug 24 02:49:22 2012
New Revision: 162546

URL: http://llvm.org/viewvc/llvm-project?rev=162546&view=rev
Log:
Add add_clang_runtime_shared_library() CMake function and use it to put the shared ASan runtime in the appropriate place.

Modified:
    compiler-rt/trunk/lib/CMakeLists.txt
    compiler-rt/trunk/lib/asan/CMakeLists.txt

Modified: compiler-rt/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/CMakeLists.txt?rev=162546&r1=162545&r2=162546&view=diff
==============================================================================
--- compiler-rt/trunk/lib/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/CMakeLists.txt Fri Aug 24 02:49:22 2012
@@ -19,6 +19,10 @@
   set_target_properties(${ARGN} PROPERTIES
                         ARCHIVE_OUTPUT_DIRECTORY ${CLANG_RUNTIME_LIB_DIR})
 endfunction()
+function(add_clang_runtime_shared_library)
+  set_target_properties(${ARGN} PROPERTIES
+                        LIBRARY_OUTPUT_DIRECTORY ${CLANG_RUNTIME_LIB_DIR})
+endfunction()
 
 # First, add the subdirectories which contain feature-based runtime libraries
 # and several convenience helper libraries.

Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=162546&r1=162545&r2=162546&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Fri Aug 24 02:49:22 2012
@@ -116,6 +116,7 @@
     LINK_FLAGS "-framework Foundation")
   list(APPEND ASAN_DYNAMIC_RUNTIME_LIBRARIES clang_rt.asan_osx_dynamic)
 endif()
+add_clang_runtime_shared_library(${ASAN_DYNAMIC_RUNTIME_LIBRARIES})
 
 
 if(LLVM_INCLUDE_TESTS)