Changeset 12099 for code/trunk

Timestamp:

Nov 14, 2018, 9:17:56 AM (6 years ago)

Author:

merholzl

Message:

Merging changes for Flatpak building convenience into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/InstallCheck.cmake (modified) (1 diff)
• cmake/tools/FindCEGUI.cmake (modified) (2 diffs)
• src/libraries/tools/Timer.h (modified) (1 diff)

code/trunk/cmake/InstallCheck.cmake

@@ -27 +27 @@
 
 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()

code/trunk/cmake/tools/FindCEGUI.cmake

@@ -36 +36 @@
   PATH_SUFFIXES
     include
+    include/cegui-0/CEGUI
     include/CEGUI
     include/cegui-0.8.4/CEGUI
@@ -51 +52 @@
     PATH_SUFFIXES
       include
+      include/cegui-0/
       include/cegui-${CEGUI_VERSION}/
   )

code/trunk/src/libraries/tools/Timer.h

@@ -78 +78 @@
 
 #include "tools/ToolsPrereqs.h"
-
+#include <functional>
 #include "core/object/Listable.h"
 #include "core/command/ExecutorPtr.h"