summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2015-08-28 00:36:58 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2015-08-28 00:36:58 +0000
commitb5288ba9d103159ea3a32147d3c71be25576c482 (patch)
tree8337e50fdc2f73af9d935d8283d41688162bfee0 /llvm
parent68b36e01da09f131f9f4cb275f3998b5b627cbca (diff)
downloadbcm5719-llvm-b5288ba9d103159ea3a32147d3c71be25576c482.tar.gz
bcm5719-llvm-b5288ba9d103159ea3a32147d3c71be25576c482.zip
[CMake] Fix build on MSVC in r246156.
add_windows_version_resource_file() affects ALL_FILES. OBJLIB shouldn't have *.obj as SOURCES. llvm-svn: 246241
Diffstat (limited to 'llvm')
-rw-r--r--llvm/cmake/modules/AddLLVM.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index 2e22077e812..30351ee92ad 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/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()
OpenPOWER on IntegriCloud