From 8890a30dfa148c4bb62882519dc8f8c845470945 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Thu, 2 Jun 2011 14:38:34 +0100
Subject: [PATCH] Make windows build user friendlier.

---
 README                  | 21 +++++++++++++++++----
 cmake/FindDirectX.cmake | 29 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 33cac29..4d6505f 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ Build as:
 You can also build the 32bit GL wrapper on 64bit distro with a multilib gcc by
 doing:
 
- cmake -H. -Bbuild32 -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_LINK_FLAGS=-m32
+ cmake -H. -Bbuild32 -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32
  make -C build32 glxtrace
 
 
@@ -42,16 +42,29 @@ Additional requirements:
 
 * Microsoft DirectX SDK (tested with August 2007 release)
 
-To build with Visual Studio invoke CMake as:
+To build with Visual Studio first invoke CMake GUI as:
 
- cmake -G "Visual Studio 9 2008" -H. -Bbuild
- cmake --build build --config MinSizeRel
+ cmake-gui -H. -B%cd%\build
+
+and press the "Configure" button.
+
+It will try to detect most required/optional dependencies automatically.  When
+not found automatically, you can manually specify the location of the
+dependencies from the GUI.
 
 If you are building with GUI support (i.e, with QT and QJSON), it should detect
 the official QT sdk automatically, but you will need to build QJSON yourself
 and also set the QJSON_INCLUDE_DIR and QJSON_LIBRARIES variables in the
 generated CMakeCache.txt when building apitrace and repeat the above sequence.
  
+After you've succesfully configured, you can start the build by opening the
+generated build\apitrace.sln solution file, or invoking cmake as:
+
+ cmake --build build --config MinSizeRel
+
+The steps to build 64bit version are similar, but replacing "Visual Studio 9
+2008" with "Visual Studio 9 2008 Win64".
+
 It's also possible to build for Windows on Linux with MinGW cross compilers.
 See http://www.cmake.org/Wiki/CmakeMingw for detailed instructions.
 
diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake
index 352e1a3..2c54023 100644
--- a/cmake/FindDirectX.cmake
+++ b/cmake/FindDirectX.cmake
@@ -137,9 +137,38 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 		endif (DirectX_D3DX10_INCLUDE_DIR AND DirectX_D3DX10_LIBRARY)
 	endif (DirectX_D3D10_INCLUDE_DIR AND DirectX_D3D10_LIBRARY)
 
+	mark_as_advanced(
+		DirectX_D3D_INCLUDE_DIR
+		DirectX_D3D_INCLUDE_DIR
+		DirectX_DDRAW_LIBRARY
+		DirectX_DDRAW_LIBRARY
+		DirectX_D3DX_INCLUDE_DIR
+		DirectX_D3DX_INCLUDE_DIR
+		DirectX_D3DX_LIBRARY
+		DirectX_D3DX_LIBRARY
+		DirectX_D3D8_INCLUDE_DIR
+		DirectX_D3D8_INCLUDE_DIR
+		DirectX_D3D8_LIBRARY
+		DirectX_D3D8_LIBRARY
+		DirectX_D3DX8_INCLUDE_DIR
+		DirectX_D3DX8_INCLUDE_DIR
+		DirectX_D3DX8_LIBRARY
+		DirectX_D3DX8_LIBRARY
+		DirectX_D3D9_INCLUDE_DIR
+		DirectX_D3D9_LIBRARY
+		DirectX_D3DX9_INCLUDE_DIR
+		DirectX_D3DX9_LIBRARY
+		DirectX_D3D10_INCLUDE_DIR
+		DirectX_D3D10_LIBRARY
+		DirectX_D3DX10_INCLUDE_DIR
+		DirectX_D3DX10_LIBRARY
+	)
+
 endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
 mark_as_advanced (
+	DirectX_D3D_FOUND
+	DirectX_D3DX_FOUND
 	DirectX_D3D8_FOUND
 	DirectX_D3DX8_FOUND
 	DirectX_D3D9_FOUND
-- 
2.43.0