maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[cmake] Restrict resource file usage to Windows build hosts 

Resource file compilation requires a working resource compiler.
Unfortunately, llvm-rc isn't quite there yet [1], and cmake's rc
invocation only works on Windows [2]. Until both those issues are
addressed, disable resource file usage on non-Windows build hosts, to
unblock Windows cross-compilation. This is also consistent with the
existing comment, which says "If *on Windows* and building with MSVC".

[1] http://lists.llvm.org/pipermail/llvm-dev/2017-October/118433.html
[2] https://public.kitware.com/pipermail/cmake/2017-October/066441.html

Differential Revision: https://reviews.llvm.org/D39265

llvm-svn: 316594
This commit is contained in:
Shoaib Meenai 2017-10-25 17:11:28 +00:00
parent 009cebfed8
commit 6391458e9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/cmake/modules/AddLLVM.cmake
View File

@ -263,14 +263,14 @@ endfunction()
# #
function(add_windows_version_resource_file OUT_VAR) function(add_windows_version_resource_file OUT_VAR)
set(sources ${ARGN}) set(sources ${ARGN})
if (MSVC) if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
set(resource_file ${LLVM_SOURCE_DIR}/resources/windows_version_resource.rc) set(resource_file ${LLVM_SOURCE_DIR}/resources/windows_version_resource.rc)
if(EXISTS ${resource_file}) if(EXISTS ${resource_file})
set(sources ${sources} ${resource_file}) set(sources ${sources} ${resource_file})
source_group("Resource Files" ${resource_file}) source_group("Resource Files" ${resource_file})
set(windows_resource_file ${resource_file} PARENT_SCOPE) set(windows_resource_file ${resource_file} PARENT_SCOPE)
endif() endif()
endif(MSVC) endif(MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
set(${OUT_VAR} ${sources} PARENT_SCOPE) set(${OUT_VAR} ${sources} PARENT_SCOPE)
endfunction(add_windows_version_resource_file) endfunction(add_windows_version_resource_file)