[Orxonox-commit 7488] r12094 - in code/branches/Flatpak: cmake cmake/tools src/libraries/tools

[merholzl at orxonox.net]

Author: merholzl
Date: 2018-11-09 23:36:12 +0100 (Fri, 09 Nov 2018)
New Revision: 12094

Modified:
   code/branches/Flatpak/cmake/InstallCheck.cmake
   code/branches/Flatpak/cmake/tools/FindCEGUI.cmake
   code/branches/Flatpak/src/libraries/tools/Timer.h
Log:
Changes needed for Flatpak compilation

Modified: code/branches/Flatpak/cmake/InstallCheck.cmake
===================================================================
--- code/branches/Flatpak/cmake/InstallCheck.cmake	2018-11-09 22:28:21 UTC (rev 12093)
+++ code/branches/Flatpak/cmake/InstallCheck.cmake	2018-11-09 22:36:12 UTC (rev 12094)
@@ -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/branches/Flatpak/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/branches/Flatpak/cmake/tools/FindCEGUI.cmake	2018-11-09 22:28:21 UTC (rev 12093)
+++ code/branches/Flatpak/cmake/tools/FindCEGUI.cmake	2018-11-09 22:36:12 UTC (rev 12094)
@@ -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/branches/Flatpak/src/libraries/tools/Timer.h
===================================================================
--- code/branches/Flatpak/src/libraries/tools/Timer.h	2018-11-09 22:28:21 UTC (rev 12093)
+++ code/branches/Flatpak/src/libraries/tools/Timer.h	2018-11-09 22:36:12 UTC (rev 12094)
@@ -77,7 +77,7 @@
 #define _Timer_H__
 
 #include "tools/ToolsPrereqs.h"
-
+#include <functional>
 #include "core/object/Listable.h"
 #include "core/command/ExecutorPtr.h"