[Orxonox-commit 7493] r12099 - in code/trunk: . cmake cmake/tools src/libraries/tools

[merholzl at orxonox.net]

Author: merholzl
Date: 2018-11-14 09:17:56 +0100 (Wed, 14 Nov 2018)
New Revision: 12099

Modified:
   code/trunk/
   code/trunk/cmake/InstallCheck.cmake
   code/trunk/cmake/tools/FindCEGUI.cmake
   code/trunk/src/libraries/tools/Timer.h
Log:
Merging changes for Flatpak building convenience into trunk

Index: code/trunk
===================================================================
--- code/trunk	2018-11-11 16:38:58 UTC (rev 12098)
+++ code/trunk	2018-11-14 08:17:56 UTC (rev 12099)

Property changes on: code/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -8,6 +8,7 ##
 /code/branches/Dialog_HS17:11455-11746
 /code/branches/Dialogue_FS17:11360-11450
 /code/branches/FlappyOrx_HS17:11460-11751
+/code/branches/Flatpak:12093-12098
 /code/branches/HUD_HS16:11212-11390,11392-11699
 /code/branches/Highscore_HS16:11226-11355
 /code/branches/Masterserver_FS18:11816-12026
Modified: code/trunk/cmake/InstallCheck.cmake
===================================================================
--- code/trunk/cmake/InstallCheck.cmake	2018-11-11 16:38:58 UTC (rev 12098)
+++ code/trunk/cmake/InstallCheck.cmake	2018-11-14 08:17:56 UTC (rev 12099)
@@ -26,5 +26,5 @@
  #
 
 IF("${CMAKE_INSTALL_CONFIG_NAME}" STREQUAL "Debug")
-  MESSAGE(FATAL_ERROR "Installing debug builds is not supported!")
+  MESSAGE(WARNING "Installing debug builds is not supported!")
 ENDIF()

Modified: code/trunk/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/trunk/cmake/tools/FindCEGUI.cmake	2018-11-11 16:38:58 UTC (rev 12098)
+++ code/trunk/cmake/tools/FindCEGUI.cmake	2018-11-14 08:17:56 UTC (rev 12099)
@@ -35,6 +35,7 @@
   PATHS $ENV{CEGUIDIR}
   PATH_SUFFIXES
     include
+    include/cegui-0/CEGUI
     include/CEGUI
     include/cegui-0.8.4/CEGUI
     include/cegui-0.8.7/CEGUI
@@ -50,6 +51,7 @@
     PATHS $ENV{CEGUIDIR}
     PATH_SUFFIXES
       include
+      include/cegui-0/
       include/cegui-${CEGUI_VERSION}/
   )
 ELSE()

Modified: code/trunk/src/libraries/tools/Timer.h
===================================================================
--- code/trunk/src/libraries/tools/Timer.h	2018-11-11 16:38:58 UTC (rev 12098)
+++ code/trunk/src/libraries/tools/Timer.h	2018-11-14 08:17:56 UTC (rev 12099)
@@ -77,7 +77,7 @@
 #define _Timer_H__
 
 #include "tools/ToolsPrereqs.h"
-
+#include <functional>
 #include "core/object/Listable.h"
 #include "core/command/ExecutorPtr.h"