From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Fri, 28 Aug 2015 00:36:58 +0000 (+0000)
Subject: [CMake] Fix build on MSVC in r246156.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=87a13599bb036b93dd8a5c0a98efde09e62f7198;p=oota-llvm.git

[CMake] Fix build on MSVC in r246156.

add_windows_version_resource_file() affects ALL_FILES. OBJLIB shouldn't have *.obj as SOURCES.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246241 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index 2e22077e812..30351ee92ad 100644
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -563,7 +563,6 @@ endmacro(add_llvm_loadable_module name)
 
 macro(add_llvm_executable name)
   llvm_process_sources( ALL_FILES ${ARGN} )
-  add_windows_version_resource_file(ALL_FILES ${ALL_FILES})
 
   # Generate objlib
   if(LLVM_ENABLE_OBJLIB)
@@ -578,6 +577,8 @@ macro(add_llvm_executable name)
     set_target_properties(${obj_name} PROPERTIES FOLDER "Object Libraries")
   endif()
 
+  add_windows_version_resource_file(ALL_FILES ${ALL_FILES})
+
   if( EXCLUDE_FROM_ALL )
     add_executable(${name} EXCLUDE_FROM_ALL ${ALL_FILES})
   else()