[llvm] r246241 - [CMake] Fix build on MSVC in r246156.

NAKAMURA Takumi via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 27 17:36:58 PDT 2015


Author: chapuni
Date: Thu Aug 27 19:36:58 2015
New Revision: 246241

URL: http://llvm.org/viewvc/llvm-project?rev=246241&view=rev
Log:
[CMake] Fix build on MSVC in r246156.

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

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=246241&r1=246240&r2=246241&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Thu Aug 27 19:36:58 2015
@@ -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()




More information about the llvm-commits mailing list