From 54ab82f88a6175a51cd65383353548cdb78cd358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Wed, 31 Aug 2011 12:06:29 +0000
Subject: [PATCH] Changed paths for Build to build only in Build dir, Disabled
 fixbundle until i really get a fix

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@402 fdac6126-5c0c-442c-9429-916003d36597
---
 cmake/ACGCommon.cmake    |  6 ++++++
 cmake/fixbundle.cmake.in | 32 ++++++++++++++++----------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake
index fdc0a2a6..5d332bd9 100644
--- a/cmake/ACGCommon.cmake
+++ b/cmake/ACGCommon.cmake
@@ -74,6 +74,12 @@ if (WIN32)
   if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
     file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
   endif ()
+elseif (APPLE)
+  set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
+  set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}")
+  set (CMAKE_LIBRARY_OUTPUT_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}")
+  set (ACG_PROJECT_PLUGINDIR "lib/${CMAKE_PROJECT_NAME}/plugins")
+  set (ACG_PROJECT_BINDIR "bin")
 else ()
   set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
   set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}")
diff --git a/cmake/fixbundle.cmake.in b/cmake/fixbundle.cmake.in
index 1bfca2d0..8b3b32eb 100644
--- a/cmake/fixbundle.cmake.in
+++ b/cmake/fixbundle.cmake.in
@@ -39,24 +39,24 @@ endfunction(gp_item_default_embedded_path_override)
 
 include (BundleUtilities)
 
-if ( @BUILD_APPS@ )
-  message("Fixing up bundle ...")
+#if ( @BUILD_APPS@ )
+#  message("Fixing up bundle ...")
+#
+#  # copy qt plugins to bundle
+#  file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/Plugins/*.so")
+#  file (GLOB_RECURSE _qtplugins "@QT_PLUGINS_DIR@/*.bundle")
+#  foreach (_qtp ${_qtplugins})
+#    get_filename_component(_dir "${_qtp}" PATH)
+#    list(APPEND _qtdirs "${_dir}")
+#  endforeach ()
 
-  # copy qt plugins to bundle
-  file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/Plugins/*.so")
-  file (GLOB_RECURSE _qtplugins "@QT_PLUGINS_DIR@/*.bundle")
-  foreach (_qtp ${_qtplugins})
-    get_filename_component(_dir "${_qtp}" PATH)
-    list(APPEND _qtdirs "${_dir}")
-  endforeach ()
+#  # Get library paths
+#  get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
 
-  # Get library paths
-  get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
-
-  # fix all dependencies
-  fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/QtViewer "${_qtplugins}" "/usr/lib;${_qtdirs};${_GlutDir}")
-
-endif()
+#  # fix all dependencies
+#  fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/QtViewer "${_qtplugins}" "/usr/lib;${_qtdirs};${_GlutDir}")
+#
+#endif()
 
 # create qt plugin configuration file
 # file(WRITE "@CMAKE_BINARY_DIR@/Build/OpenMesh.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins")