[llvm-branch-commits] [compiler-rt-branch] r242445 - Merging r242444:

[Hans Wennborg]

Author: hans
Date: Thu Jul 16 16:24:03 2015
New Revision: 242445

URL: http://llvm.org/viewvc/llvm-project?rev=242445&view=rev
Log:
Merging r242444:
------------------------------------------------------------------------
r242444 | samsonov | 2015-07-16 14:20:05 -0700 (Thu, 16 Jul 2015) | 3 lines

[CMake] One more attempt to fix PR24144.

This time, exclude ExternalProject from build using set_target_properties.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_37/   (props changed)
    compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake

Propchange: compiler-rt/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 16:24:03 2015
@@ -1 +1 @@
-/compiler-rt/trunk:242350,242424
+/compiler-rt/trunk:242350,242424,242444

Modified: compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake?rev=242445&r1=242444&r2=242445&view=diff
==============================================================================
--- compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake Thu Jul 16 16:24:03 2015
@@ -245,7 +245,6 @@ macro(add_custom_libcxx name prefix)
     list(APPEND LIBCXX_DEPS clang)
   endif()
 
-  set(EXCLUDE_FROM_ALL TRUE)
   ExternalProject_Add(${name}
     PREFIX ${prefix}
     SOURCE_DIR ${COMPILER_RT_LIBCXX_PATH}
@@ -259,6 +258,7 @@ macro(add_custom_libcxx name prefix)
     LOG_CONFIGURE 1
     LOG_INSTALL 1
     )
+  set_target_properties(${name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
 
   ExternalProject_Add_Step(${name} force-reconfigure
     DEPENDERS configure
@@ -272,5 +272,4 @@ macro(add_custom_libcxx name prefix)
     DEPENDERS configure
     DEPENDS ${LIBCXX_DEPS}
     )
-  set(EXCLUDE_FROM_ALL FALSE)
 endmacro()