From cd2ce8c5557f3e24f556427b5a29bd0ffde850eb Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Fri, 1 Oct 2010 12:45:54 +0200
Subject: [PATCH] Fixed: Use of new CMAKE_*_OUTPUT_DIRECTORY

---
 code/CMakeLists.txt                | 11 ++++++++---
 code/CMakeModules/PCHSupport.cmake |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 1e1ef2811..e57eadfdb 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -54,9 +54,14 @@ SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
 #-----------------------------------------------------------------------------
 # Redirect output files
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+# DLL should be in the same directory as EXE under Windows
+IF(WIN32)
+  SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ELSE(WIN32)
+  SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ENDIF(WIN32)
 
 IF(WIN32)
   IF(WITH_MFC)
diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index 46a556900..d687b3282 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -68,6 +68,8 @@ MACRO(_PCH_GET_PDB_FILENAME out_filename _target)
 	GET_TARGET_PROPERTY(_targetType ${_target} TYPE)
 	IF(${_targetType} STREQUAL EXECUTABLE)
 		SET(_targetOutput ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+	ELSEIF(${_targetType} STREQUAL STATIC_LIBRARY)
+		SET(_targetOutput ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
 	ELSE(${_targetType} STREQUAL EXECUTABLE)
 		SET(_targetOutput ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 	ENDIF(${_targetType} STREQUAL EXECUTABLE)