This is an archive of the discontinued LLVM Phabricator instance.

Differential D7457

Update root CMake to define LLVM_ENABLE_DIA_SDK when appropriate.
ClosedPublic

Authored by zturner on Feb 5 2015, 9:01 PM.

Details

Reviewers
chandlerc
Commits
rG733b849a3020: Define HAVE_DIA_SDK on Windows when DIA is present.
rL228669: Define HAVE_DIA_SDK on Windows when DIA is present.
Summary

This allows all CMake projects, as well as C++ code, to detect if and when DIA SDK is available for use.

This is independent of actually having any DIA-based code in the codebase, so in theory can go in now, even though the DIA stuff isn't in yet.

I'm not sure if I did this correctly. LMK if I overlooked something or if I'm going about this wrong.

Diff Detail

Event Timeline

zturner updated this revision to Diff 19456.Feb 5 2015, 9:01 PM
zturner retitled this revision from to Update root CMake to define LLVM_ENABLE_DIA_SDK when appropriate..
zturner updated this object.
zturner edited the test plan for this revision. (Show Details)
zturner added a reviewer: chandlerc.
zturner added a subscriber: Unknown Object (MLST).
zturner added a comment.Feb 9 2015, 1:56 PM

friendly ping to bring this to the top of your inbox

chandlerc added inline comments.Feb 9 2015, 5:01 PM
include/llvm/Config/config.h.in
540–542

Need to update the config.h.cmake as well.

include/llvm/Config/llvm-config.h.cmake
83–85

We shouldn't expose this to our headers, or our installed headers.

zturner updated this revision to Diff 19635.Feb 9 2015, 5:58 PM

Fix up suggestions from chandlerc. Moved the detection logic into cmake-ix as well, and renamed the variable HAVE_DIA_SDK instead of LLVM_ENABLE_DIA_SDK.

chandlerc accepted this revision.Feb 9 2015, 6:19 PM
chandlerc edited edge metadata.

LGTM, thanks.

This revision is now accepted and ready to land.Feb 9 2015, 6:19 PM
Closed by commit rL228669: Define HAVE_DIA_SDK on Windows when DIA is present. (authored by zturner). · Explain WhyFeb 9 2015, 9:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
17 lines
include/
llvm/
Config/
3 lines
3 lines
3 lines

Diff 19456

CMakeLists.txt

Context not available.
# MSVC has a gazillion warnings with this. # MSVC has a gazillion warnings with this.
if( MSVC ) if( MSVC )
option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." OFF) option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." OFF)
# See if the DIA SDK is available and usable.
set(MSVC_DIA_SDK_DIR "$ENV{VSINSTALLDIR}DIA SDK")
# Due to a bug in MSVC 2013's installation software, it is possible
# for MSVC 2013 to write the DIA SDK into the Visual Studio 2012
# install directory. If this happens, the installation is corrupt
# and there's nothing we can do. It happens with enough frequency
# though that we should handle it. We do so by simply checking that
# the DIA SDK folder exists. Should this happen you will need to
# uninstall VS 2012 and then re-install VS 2013.
if (IS_DIRECTORY ${MSVC_DIA_SDK_DIR})
set(LLVM_ENABLE_DIA_SDK 1)
else()
set(LLVM_ENABLE_DIA_SDK 0)
endif()
else() else()
option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON) option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
set(LLVM_ENABLE_DIA_SDK 0)
endif() endif()
option(LLVM_ENABLE_MODULES "Compile with C++ modules enabled." OFF) option(LLVM_ENABLE_MODULES "Compile with C++ modules enabled." OFF)
Context not available.

include/llvm/Config/config.h.in

Context not available.
/* Installation prefix directory */ /* Installation prefix directory */
#undef LLVM_PREFIX #undef LLVM_PREFIX
/* Define if we have the DIA SDK */
#undef LLVM_ENABLE_DIA_SDK
chandlercUnsubmitted
Not Done
ReplyInline Actions

Need to update the config.h.cmake as well.

chandlerc: Need to update the config.h.cmake as well.
/* Define if we have the Intel JIT API runtime support library */ /* Define if we have the Intel JIT API runtime support library */
#undef LLVM_USE_INTEL_JITEVENTS #undef LLVM_USE_INTEL_JITEVENTS
Context not available.

include/llvm/Config/llvm-config.h.cmake

Context not available.
/* Installation prefix directory */ /* Installation prefix directory */
#cmakedefine LLVM_PREFIX "${LLVM_PREFIX}" #cmakedefine LLVM_PREFIX "${LLVM_PREFIX}"
/* Define if we have the DIA SDK */
#cmakedefine LLVM_ENABLE_DIA_SDK ${LLVM_ENABLE_DIA_SDK}
chandlercUnsubmitted
Not Done
ReplyInline Actions

We shouldn't expose this to our headers, or our installed headers.

chandlerc: We shouldn't expose this to our headers, or our installed headers.
/* Define if we have the Intel JIT API runtime support library */ /* Define if we have the Intel JIT API runtime support library */
#cmakedefine LLVM_USE_INTEL_JITEVENTS 1 #cmakedefine LLVM_USE_INTEL_JITEVENTS 1
Context not available.

include/llvm/Config/llvm-config.h.in

Context not available.
/* Define if we have the Intel JIT API runtime support library */ /* Define if we have the Intel JIT API runtime support library */
#undef LLVM_USE_INTEL_JITEVENTS #undef LLVM_USE_INTEL_JITEVENTS
/* Define if we have the DIA SDK */
#undef LLVM_ENABLE_DIA_SDK
/* Define if we have the oprofile JIT-support library */ /* Define if we have the oprofile JIT-support library */
#undef LLVM_USE_OPROFILE #undef LLVM_USE_OPROFILE
Context not available.