This is an archive of the discontinued LLVM Phabricator instance.

Differential D41220

[cmake] Only attempt to install MSVC system libraries on Windows
ClosedPublic

Authored by smeenai on Dec 13 2017, 7:07 PM.

Details

Reviewers
compnerd
rnk
zturner
Commits
rG7fe22d613f34: [cmake] Only attempt to install MSVC system libraries on Windows
rL320724: [cmake] Only attempt to install MSVC system libraries on Windows
Summary

Newer versions of CMake (I'm on 3.10, but I believe 3.9 behaves the same
way) attempt to query the system for information about the VS 2017
install. Unfortunately, this query fails on non-Windows systems:

cmake_host_system_information does not recognize <key> VS_15_DIR

CMake isn't going to find these system libraries on non-Windows anyway
(and we were previously silencing the resultant warnings in our
cross-compilation toolchain), so it makes sense to just omit the
attempted installation entirely on non-Windows.

Diff Detail

Event Timeline

smeenai created this revision.Dec 13 2017, 7:07 PM
Herald added a subscriber: mgorny. · View Herald TranscriptDec 13 2017, 7:07 PM
This revision was not accepted when it landed; it landed in state Needs Review.Dec 14 2017, 10:42 AM
Closed by commit rL320724: [cmake] Only attempt to install MSVC system libraries on Windows (authored by smeenai). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
2 lines
cmake/
platforms/
6 lines

Diff 126888

CMakeLists.txt

Show First 20 Lines • Show All 1,004 Lines • ▼ Show 20 Lines else()
message(SEND_ERROR "Specified distribution component '${target}' doesn't have an install-stripped target." message(SEND_ERROR "Specified distribution component '${target}' doesn't have an install-stripped target."
" Its installation target creation should be changed to use add_llvm_install_targets," " Its installation target creation should be changed to use add_llvm_install_targets,"
" or you should manually create the 'install-${target}-stripped' target.") " or you should manually create the 'install-${target}-stripped' target.")
endif() endif()
endforeach() endforeach()
endif() endif()
# This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake # This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake
if (MSVC) if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
endif() endif()

cmake/platforms/WinMsvc.cmake

Show First 20 Lines • Show All 294 Lines • ▼ Show 20 Lines
set(CMAKE_SHARED_LINKER_FLAGS "${_CMAKE_SHARED_LINKER_FLAGS_INITIAL} ${LINK_FLAGS}" CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS "${_CMAKE_SHARED_LINKER_FLAGS_INITIAL} ${LINK_FLAGS}" CACHE STRING "" FORCE)
# CMake populates these with a bunch of unnecessary libraries, which requires # CMake populates these with a bunch of unnecessary libraries, which requires
# extra case-correcting symlinks and what not. Instead, let projects explicitly # extra case-correcting symlinks and what not. Instead, let projects explicitly
# control which libraries they require. # control which libraries they require.
set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE) set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE) set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
# CMake's InstallRequiredSystemLibraries module searches for a Visual Studio
# installation in order to determine where to copy the required DLLs. This
# installation won't exist when cross-compiling, of course, so silence the
# resulting warnings about missing libraries.
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
# Allow clang-cl to work with macOS paths. # Allow clang-cl to work with macOS paths.
set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/ClangClCMakeCompileRules.cmake") set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/ClangClCMakeCompileRules.cmake")