diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-09-07 12:09:53 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-09-07 12:09:53 +0000 |
| commit | cfc6c4293039552f202f876335e4b66c3747e29a (patch) | |
| tree | ffb571025437522673ec34290c9b44247880bed5 /devel/cmake/files | |
| parent | 679e84470dc12a145262007bd7529a3bdd65f0c7 (diff) | |
Notes
Diffstat (limited to 'devel/cmake/files')
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindwxWidgets.cmake | 12 | ||||
| -rw-r--r-- | devel/cmake/files/patch-git_c775072a | 20 |
2 files changed, 6 insertions, 26 deletions
diff --git a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake index 01c7b5f07c17..8c9eb6c1aeee 100644 --- a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake +++ b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake @@ -1,11 +1,11 @@ ---- Modules/FindwxWidgets.cmake.orig 2013-10-14 16:39:11.995705456 +0300 -+++ Modules/FindwxWidgets.cmake 2013-10-14 16:39:31.315704621 +0300 -@@ -702,7 +702,7 @@ - # UNIX: Start actual work. +--- Modules/FindwxWidgets.cmake.orig 2015-07-23 15:59:33.000000000 +0200 ++++ Modules/FindwxWidgets.cmake 2015-08-10 20:04:36.068295000 +0200 +@@ -741,7 +741,7 @@ #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. -- find_program(wxWidgets_CONFIG_EXECUTABLE wx-config -+ find_program(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config + find_program(wxWidgets_CONFIG_EXECUTABLE +- NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8 ++ NAMES $ENV{WX_CONFIG} wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8 DOC "Location of wxWidgets library configuration provider binary (wx-config)." ONLY_CMAKE_FIND_ROOT_PATH ) diff --git a/devel/cmake/files/patch-git_c775072a b/devel/cmake/files/patch-git_c775072a deleted file mode 100644 index b867712d24a6..000000000000 --- a/devel/cmake/files/patch-git_c775072a +++ /dev/null @@ -1,20 +0,0 @@ -commit c775072ad5a93306183f83f4396268b1690bb392 -Author: Brad King <brad.king@kitware.com> -Date: Wed Apr 22 09:58:46 2015 -0400 - - cmGeneratorExpressionEvaluationFile: Add missing sys/types.h include - - This is needed for 'mode_t', and on mingw-w64 in particular. We added - use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use - permissions of input file if present, 2014-07-22). - ---- Source/cmGeneratorExpressionEvaluationFile.h -+++ Source/cmGeneratorExpressionEvaluationFile.h -@@ -13,6 +13,7 @@ - #define cmGeneratorExpressionEvaluationFile_h - - #include "cmStandardIncludes.h" -+#include <sys/types.h> - #include <cmsys/auto_ptr.hxx> - - #include "cmGeneratorExpression.h" |