From 06a4d986ff9bdc26d87ef8f8899b4bbd6dee6857 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Fri, 28 Aug 2015 00:36:58 +0000 Subject: [PATCH 3/6] [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 --- cmake/modules/AddLLVM.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 8f22212..258e684 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() -- 2.5.3