This is an archive of the discontinued LLVM Phabricator instance.

Differential D27135

[CMAKE] fix LLVM_OPTIMIZED_TABLEGEN for Visual Studio
ClosedPublic

Authored by dfukalov on Nov 25 2016, 9:00 AM.

Details

Reviewers
beanz
Commits
rGfb501330761d: [CMAKE] fix LLVM_OPTIMIZED_TABLEGEN for Visual Studio
rL288042: [CMAKE] fix LLVM_OPTIMIZED_TABLEGEN for Visual Studio
Summary

At the moment optimized tablegen is generated by LLVM_USE_HOST_TOOLS variable that is not set for Visual Sudio since LLVM_ENABLE_ASSERTIONS depends on CMAKE_BUILD_TYPE value that is not equal to "DEBUG" in case of Visual Studio soltion generation.

Modified to do not depend on LLVM_ENABLE_ASSERTIONS value in VS and Xcode cases

Diff Detail

Event Timeline

dfukalov updated this revision to Diff 79311.Nov 25 2016, 9:00 AM
dfukalov retitled this revision from to [CMAKE] fix LLVM_OPTIMIZED_TABLEGEN for Visual Studio.
dfukalov updated this object.
dfukalov added a reviewer: beanz.
Herald added a subscriber: mgorny. · View Herald TranscriptNov 25 2016, 9:00 AM
dfukalov added a subscriber: llvm-commits.Nov 25 2016, 9:01 AM
beanz added inline comments.Nov 27 2016, 9:58 PM
CMakeLists.txt
532

Rather than OR MSVC_IDE maybe use OR CMAKE_CONFIGURATION_TYPES, that would make this work for all multi-configuration generators.

RKSimon added a subscriber: RKSimon.Nov 27 2016, 11:44 PM
dfukalov updated this revision to Diff 79400.Nov 28 2016, 7:10 AM
dfukalov updated this object.

refined with Chris suggestion

dfukalov marked an inline comment as done.Nov 28 2016, 7:11 AM
dfukalov added inline comments.
CMakeLists.txt
532

good point, thanks!

beanz accepted this revision.Nov 28 2016, 9:01 AM
beanz edited edge metadata.

LGTM!

This revision is now accepted and ready to land.Nov 28 2016, 9:01 AM
Closed by commit rL288042: [CMAKE] fix LLVM_OPTIMIZED_TABLEGEN for Visual Studio (authored by dfukalov). · Explain WhyNov 28 2016, 9:22 AM
This revision was automatically updated to reflect the committed changes.
dfukalov marked an inline comment as done.

Revision Contents

PathSize
2 lines

Diff 79311

CMakeLists.txt

Show First 20 Lines • Show All 523 Lines • ▼ Show 20 Lines
option(LLVM_BUILD_LLVM_C_DYLIB "Build libllvm-c re-export library (Darwin Only)" OFF) option(LLVM_BUILD_LLVM_C_DYLIB "Build libllvm-c re-export library (Darwin Only)" OFF)
set(LLVM_BUILD_LLVM_DYLIB_default OFF) set(LLVM_BUILD_LLVM_DYLIB_default OFF)
if(LLVM_LINK_LLVM_DYLIB OR LLVM_BUILD_LLVM_C_DYLIB) if(LLVM_LINK_LLVM_DYLIB OR LLVM_BUILD_LLVM_C_DYLIB)
set(LLVM_BUILD_LLVM_DYLIB_default ON) set(LLVM_BUILD_LLVM_DYLIB_default ON)
endif() endif()
option(LLVM_BUILD_LLVM_DYLIB "Build libllvm dynamic library" ${LLVM_BUILD_LLVM_DYLIB_default}) option(LLVM_BUILD_LLVM_DYLIB "Build libllvm dynamic library" ${LLVM_BUILD_LLVM_DYLIB_default})
option(LLVM_OPTIMIZED_TABLEGEN "Force TableGen to be built with optimization" OFF) option(LLVM_OPTIMIZED_TABLEGEN "Force TableGen to be built with optimization" OFF)
if(CMAKE_CROSSCOMPILING OR (LLVM_OPTIMIZED_TABLEGEN AND LLVM_ENABLE_ASSERTIONS)) if(CMAKE_CROSSCOMPILING OR (LLVM_OPTIMIZED_TABLEGEN AND (LLVM_ENABLE_ASSERTIONS OR MSVC_IDE)))
beanzUnsubmitted
Done
ReplyInline Actions

Rather than OR MSVC_IDE maybe use OR CMAKE_CONFIGURATION_TYPES, that would make this work for all multi-configuration generators.

beanz: Rather than `OR MSVC_IDE` maybe use `OR CMAKE_CONFIGURATION_TYPES`, that would make this work…
dfukalovAuthorUnsubmitted
Not Done
ReplyInline Actions

good point, thanks!

dfukalov: good point, thanks!
set(LLVM_USE_HOST_TOOLS ON) set(LLVM_USE_HOST_TOOLS ON)
endif() endif()
if (MSVC_IDE AND NOT (MSVC_VERSION LESS 1900)) if (MSVC_IDE AND NOT (MSVC_VERSION LESS 1900))
option(LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION "Configure project to use Visual Studio native visualizers" TRUE) option(LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION "Configure project to use Visual Studio native visualizers" TRUE)
else() else()
set(LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION FALSE CACHE INTERNAL "For Visual Studio 2013, manually copy natvis files to Documents\\Visual Studio 2013\\Visualizers" FORCE) set(LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION FALSE CACHE INTERNAL "For Visual Studio 2013, manually copy natvis files to Documents\\Visual Studio 2013\\Visualizers" FORCE)
endif() endif()
▲ Show 20 Lines • Show All 419 Lines • Show Last 20 Lines