[llvm] r212313 - [CMake] Fix set_output_directory to do nothing if *_OUTPUT_INTDIR was not given.

NAKAMURA Takumi geek4civic at gmail.com
Thu Jul 3 21:23:16 PDT 2014


Author: chapuni
Date: Thu Jul  3 23:23:15 2014
New Revision: 212313

URL: http://llvm.org/viewvc/llvm-project?rev=212313&view=rev
Log:
[CMake] Fix set_output_directory to do nothing if *_OUTPUT_INTDIR was not given.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=212313&r1=212312&r2=212313&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Thu Jul  3 23:23:15 2014
@@ -150,6 +150,11 @@ endfunction(add_dead_strip)
 # Note: Don't set variables CMAKE_*_OUTPUT_DIRECTORY any more,
 # or a certain builder, for eaxample, msbuild.exe, would be confused.
 function(set_output_directory target bindir libdir)
+  # Do nothing if *_OUTPUT_INTDIR is empty.
+  if("${bindir}" STREQUAL "")
+    return()
+  endif()
+
   if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
     foreach(build_mode ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER "${build_mode}" CONFIG_SUFFIX)





More information about the llvm-commits mailing list