From 8189983b3248e7efac8d854990f7d3a4db111e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Thu, 4 Jun 2009 14:41:31 +0000
Subject: [PATCH] Dennis: Updated cmake

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@149 fdac6126-5c0c-442c-9429-916003d36597
---
 cmake/ACGCommon.cmake | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake
index 0be16967..e6c6d92b 100644
--- a/cmake/ACGCommon.cmake
+++ b/cmake/ACGCommon.cmake
@@ -57,11 +57,11 @@ endmacro ()
 # set directory structures for the different platforms
 if (WIN32)
   set (ACG_PROJECT_DATADIR ".")
-  set (ACG_PROJECT_LIBDIR "bin")
-  set (ACG_PROJECT_BINDIR "bin")
+  set (ACG_PROJECT_LIBDIR "lib")
+  set (ACG_PROJECT_BINDIR ".")
   set (ACG_PROJECT_PLUGINDIR "Plugins")
-  if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR})
-    file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR})
+  if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
+    file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
   endif ()
 else ()
   set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
@@ -342,7 +342,7 @@ function (acg_add_library _target _type)
                           COMMAND ${CMAKE_COMMAND} -E
                           copy_if_different
                             ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.dll
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/${_target}.dll)
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/${_target}.dll)
     elseif (${_type} STREQUAL MODULE)
       if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
         file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
@@ -353,6 +353,13 @@ function (acg_add_library _target _type)
                             ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.dll
                             ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/${_target}.dll)
     endif ()
+    if (${_type} STREQUAL SHARED OR ${_type} STREQUAL STATIC)
+      add_custom_command (TARGET ${_target} POST_BUILD
+                          COMMAND ${CMAKE_COMMAND} -E
+                          copy_if_different
+                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.lib
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/${_target}.lib)
+    endif ()
   elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
     if (${_type} STREQUAL SHARED)
       add_custom_command (TARGET ${_target} POST_BUILD
@@ -372,8 +379,11 @@ function (acg_add_library _target _type)
     endif ()
   endif ()
   if (NOT ACG_PROJECT_BUNDLE OR NOT APPLE)
-    if (${_type} STREQUAL SHARED)
-      install (TARGETS ${_target} DESTINATION ${ACG_PROJECT_LIBDIR})
+    if (${_type} STREQUAL SHARED OR ${_type} STREQUAL STATIC)
+      install (TARGETS ${_target}
+               RUNTIME DESTINATION ${ACG_PROJECT_BINDIR}
+               LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR}
+               ARCHIVE DESTINATION ${ACG_PROJECT_LIBDIR})
     elseif (${_type} STREQUAL MODULE)
       install (TARGETS ${_target} DESTINATION ${ACG_PROJECT_PLUGINDIR})
     endif ()