viewer.git/indra/cmake/DirectX.cmake, branch 26.1.1Megapahit's fork of the Second Life viewer.
https://megapahit.org/viewer.git/atom?h=26.1.12020-05-20T14:46:55ZRemove DirectX.cmake. With recent SDKs (dating back to at least VS 20132020-05-20T14:46:55ZNicky Dasmijnnicky.dasmijn@phoenixviewer.com2020-05-18T22:03:19Zurn:sha1:6148a6443af886f9b71b4c88084db943950e146c
and the 8.1 SDK) DirectX is included in the SDK and does not need any
special detection logic.
DRTVWR-476: Use find_library(dxguid) rather than find_path().2020-05-11T15:44:51ZNat Goodspeednat@lindenlab.com2020-05-11T15:39:27Zurn:sha1:c74810ca3fc7e5a3f6b84a3d3259294aaa9288beDRTVWR-476: Help DirectX.cmake cope with multiple SDK versions.2020-05-07T20:59:19ZNat Goodspeednat@lindenlab.com2020-05-07T20:59:19Zurn:sha1:92c70ff637da5fda06aaeb40914c77499bf2d0ce
First, get rid of ancient cruft in the find_path() calls: on a 64-bit system,
"$ENV{PROGRAMFILES}" expands to the 64-bit 'Program Files' directory rather
than the 32-bit 'Program Files (x86)' directory, and none of the ancient cruft
would be found there anyway.
Empirically, find_path(dxdiag.h) is able to find the file using environment
variables (INCLUDE from VS variables?), so it doesn't need the specific
pathnames coded into that call.
Once we find DIRECTX_INCLUDE_DIR, don't immediately insert it into
include_directories: we've had troubles with incompatible Windows SDK versions
(compile errors in Microsoft header files!) when DIRECTX_INCLUDE_DIR preceded
the Windows SDK directory in the include path.
The DIRECTX_FIND_QUIETLY logic seemed backwards: the message(STATUS) output was
emitted only when DIRECTX_FIND_QUIETLY was false. Reverse that.
The ancient cruft in find_path(dxguid.lib) was causing it to find the wrong
(very old) DirectX library. Remove ancient cruft. But empirically, without
that, even once we've found DIRECTX_INCLUDE_DIR, CMake could not implicitly
find dxguid.lib. If the DirectX directory hierarchy were structured as
.../version/Include and .../version/Lib, a relative pathname would have been
sufficient hint. Unfortunately it's structured as .../Include/version and
.../Lib/version, so a relative pathname would have to include the specific
version. Instead, replace "/Include/" with "/Lib/". But even then, we have to
drill down to the architecture-specific subdirectory based on ADDRESS_SIZE.
remove execute permission from many files that should not have it2015-11-10T14:48:56ZOz Lindenoz@lindenlab.com2015-11-10T14:48:56Zurn:sha1:c8726aba303bcf1207b730a344536e25491420bcmerge changes for DRTVWR-2942013-04-19T14:11:29ZOz Lindenoz@lindenlab.com2013-04-19T14:11:29Zurn:sha1:ddd5659f815a39e9a8ef0e86c911fea75a7d8848Update Mac and Windows breakpad builds to latest2013-03-29T14:50:08ZGraham Madaraszgraham@lindenlab.com2013-03-29T14:50:08Zurn:sha1:bf6182daa8b4d7cea79310547f71d7a3155e17b0Removing server-related cmake cruft. Fixing libGLU warnings on linux.2012-10-04T03:12:48ZDon Kjerdon@lindenlab.com2012-10-04T03:12:48Zurn:sha1:c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5Cherry-picked windows build fixes from sunshine-experimental2012-09-24T19:42:58ZDon Kjerdon@lindenlab.com2012-09-24T19:42:58Zurn:sha1:95f3fb45ae2f4fe199e34f35be1e46b3a598ca1afind latest DirectX dirs.2011-01-31T20:54:57ZAlain Lindenalain@lindenlab.com2011-01-31T20:54:57Zurn:sha1:d9a0a04af4d48d8f1e8ef6e70d3d0863689071bdFix to develop.py to build on 64 bit windows.2009-05-19T23:41:59ZMark Palangepalange@lindenlab.com2009-05-19T23:41:59Zurn:sha1:8c5ca38f1d48edace2a67df00dc319381dc313af
Added March 2009 DirectX SDK to cmake config.
Reviewed by brad