[Orxonox-commit 6647] r11285 - in code/branches/mac_HS16: . cmake cmake/tools

[ahedges at orxonox.net]

Author: ahedges
Date: 2016-11-14 15:46:36 +0100 (Mon, 14 Nov 2016)
New Revision: 11285

Added:
   code/branches/mac_HS16/.clang-format
Modified:
   code/branches/mac_HS16/cmake/CopyLibPhase.cmake
   code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake
Log:
add clang-format config and document CopyLibPhase


Added: code/branches/mac_HS16/.clang-format
===================================================================
--- code/branches/mac_HS16/.clang-format	                        (rev 0)
+++ code/branches/mac_HS16/.clang-format	2016-11-14 14:46:36 UTC (rev 11285)
@@ -0,0 +1,7 @@
+---
+Language:        Cpp
+BasedOnStyle:  WebKit
+NamespaceIndentation: All
+BreakBeforeBraces: Allman
+BreakConstructorInitializersBeforeComma: false
+...

Modified: code/branches/mac_HS16/cmake/CopyLibPhase.cmake
===================================================================
--- code/branches/mac_HS16/cmake/CopyLibPhase.cmake	2016-11-14 14:46:04 UTC (rev 11284)
+++ code/branches/mac_HS16/cmake/CopyLibPhase.cmake	2016-11-14 14:46:36 UTC (rev 11285)
@@ -1,3 +1,29 @@
+#
+#             ORXONOX - the hottest 3D action shooter ever to exist
+#                             > www.orxonox.net <
+#
+#        This program is free software; you can redistribute it and/or
+#         modify it under the terms of the GNU General Public License
+#        as published by the Free Software Foundation; either version 2
+#            of the License, or (at your option) any later version.
+#
+#       This program is distributed in the hope that it will be useful,
+#        but WITHOUT ANY WARRANTY; without even the implied warranty of
+#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#                 GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#      with this program; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+#
+#  Author:
+#    Alexander Hedges
+#  Description:
+#    Copies the libs into to all the app bundles of the target destinations.
+#
+
+# Specify dependency locations
 SET(DEP_INCLUDE_DIR   ${DEPENDENCY_PACKAGE_DIR}/include)
 SET(DEP_LIBRARY_DIR   ${DEPENDENCY_PACKAGE_DIR}/lib)
 SET(DEP_BINARY_DIR    ${DEPENDENCY_PACKAGE_DIR}/bin)
@@ -3,5 +29,5 @@
 SET(DEP_FRAMEWORK_DIR ${DEPENDENCY_PACKAGE_DIR}/Library/Frameworks)
 
-# Install on OSX
+# Copy libs to all app folders
 foreach(target IN ITEMS ${CMAKE_CONFIGURATION_TYPES})
     file(GLOB_RECURSE dep_frameworks FOLLOW_SYMLINKS "${DEP_FRAMEWORK_DIR}/*")

Modified: code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake	2016-11-14 14:46:04 UTC (rev 11284)
+++ code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake	2016-11-14 14:46:36 UTC (rev 11285)
@@ -90,9 +90,6 @@
   PATH_SUFFIXES lib bin
 )
 
-MESSAGE("Looking for ceguitolua++")
-MESSAGE(${DEP_INCLUDE_DIR})
-
 # Find CEGUI Tolua++ include file
 # We only need to add this path since we use tolua++ like a normal
 # dependency but it is shipped with CEGUILua.