From 14f65a5cac7187f9bbed40000df4dc5f096c0480 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Tue, 9 Feb 2010 21:12:36 +0000
Subject: [PATCH] fix minor issue with cmake build system

---
 Demos/CMakeLists.txt               |  6 ++---
 Demos/SerializeDemo/CMakeLists.txt | 42 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt
index ac5f4a8a1..7593fb319 100644
--- a/Demos/CMakeLists.txt
+++ b/Demos/CMakeLists.txt
@@ -14,12 +14,10 @@ SET(SharedDemoSubdirs
 
 
 if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	SUBDIRS( OpenGL 
-		${SharedDemoSubdirs}
+	SUBDIRS( 	${SharedDemoSubdirs}
 	)
 else (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	SUBDIRS( OpenGL 
-		${SharedDemoSubdirs}
+	SUBDIRS( 		${SharedDemoSubdirs}
 		MultiThreadedDemo
 		MiniCL_VectorAdd
 	)
diff --git a/Demos/SerializeDemo/CMakeLists.txt b/Demos/SerializeDemo/CMakeLists.txt
index 9392f9e07..33e19f357 100644
--- a/Demos/SerializeDemo/CMakeLists.txt
+++ b/Demos/SerializeDemo/CMakeLists.txt
@@ -38,23 +38,23 @@ IF (USE_GLUT)
 			SerializeDemo.h
 		)
 	ENDIF()
-	
-IF (WIN32)
-	IF (CMAKE_CL_64)
-		ADD_CUSTOM_COMMAND(
-			TARGET AppSerializeDemo
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-		)
-	ELSE(CMAKE_CL_64)
-		ADD_CUSTOM_COMMAND(
-			TARGET AppSerializeDemo
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-		)
-	ENDIF(CMAKE_CL_64)
-ENDIF(WIN32)
-
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (WIN32)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppSerializeDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppSerializeDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF(WIN32)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	
 ELSE (USE_GLUT)
 
@@ -82,8 +82,8 @@ IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 
 
-IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
-			SET_TARGET_PROPERTIES(AppSerializeDemo PROPERTIES  DEBUG_POSTFIX "_Debug")
-			SET_TARGET_PROPERTIES(AppSerializeDemo PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
-			SET_TARGET_PROPERTIES(AppSerializeDemo PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
+IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+			SET_TARGET_PROPERTIES(AppSerializeDemo PROPERTIES  DEBUG_POSTFIX "_Debug")
+			SET_TARGET_PROPERTIES(AppSerializeDemo PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
+			SET_TARGET_PROPERTIES(AppSerializeDemo PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
 ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
\ No newline at end of file