This is an archive of the discontinued LLVM Phabricator instance.

[CMake] Allow overriding MSVC_DIA_SDK_DIR via CMake
ClosedPublic

Authored by mstorsjo on Oct 21 2019, 1:04 AM.

Download Raw Diff

Details

Reviewers

rnk
thakis
zturner
smeenai

Commits

rGe659fff2fb72: [CMake] Allow overriding MSVC_DIA_SDK_DIR via CMake
rL375485: [CMake] Allow overriding MSVC_DIA_SDK_DIR via CMake

Summary

This eases using it in cross-msvc setups.

Diff Detail

Event Timeline

mstorsjo created this revision.Oct 21 2019, 1:04 AM

Herald added a project: Restricted Project. · View Herald TranscriptOct 21 2019, 1:04 AM

Herald added a subscriber: mgorny. · View Herald Transcript

mstorsjo added a reviewer: smeenai.Oct 21 2019, 1:20 PM

Seems fine :)

This revision is now accepted and ready to land.Oct 21 2019, 1:39 PM

LGTM

llvm/cmake/config-ix.cmake
477	Nit: use PATH instead of STRING.

Closed by commit rGe659fff2fb72: [CMake] Allow overriding MSVC_DIA_SDK_DIR via CMake (authored by mstorsjo). · Explain WhyOct 21 2019, 11:43 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

cmake/

config-ix.cmake

3 lines

Diff 225826

llvm/cmake/config-ix.cmake

	Show First 20 Lines • Show All 468 Lines • ▼ Show 20 Lines
	endif ()			endif ()

	if( MSVC )			if( MSVC )
	set(SHLIBEXT ".lib")			set(SHLIBEXT ".lib")
	set(stricmp "_stricmp")			set(stricmp "_stricmp")
	set(strdup "_strdup")			set(strdup "_strdup")

	# See if the DIA SDK is available and usable.			# See if the DIA SDK is available and usable.
	set(MSVC_DIA_SDK_DIR "$ENV{VSINSTALLDIR}DIA SDK")			set(MSVC_DIA_SDK_DIR "$ENV{VSINSTALLDIR}DIA SDK" CACHE STRING
				smeenaiUnsubmitted Not Done Reply Inline Actions Nit: use PATH instead of STRING. smeenai: Nit: use PATH instead of STRING.
				"Path to the DIA SDK")

	# Due to a bug in MSVC 2013's installation software, it is possible			# 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			# for MSVC 2013 to write the DIA SDK into the Visual Studio 2012
	# install directory. If this happens, the installation is corrupt			# install directory. If this happens, the installation is corrupt
	# and there's nothing we can do. It happens with enough frequency			# 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			# 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			# the DIA SDK folder exists. Should this happen you will need to
	# uninstall VS 2012 and then re-install VS 2013.			# uninstall VS 2012 and then re-install VS 2013.
	▲ Show 20 Lines • Show All 183 Lines • Show Last 20 Lines