diff options
| author | rakuco <rakuco@FreeBSD.org> | 2013-11-06 02:34:22 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2013-11-06 02:34:22 +0800 |
| commit | 905304d05f3b7a9a489cd782748daf74e8d882e1 (patch) | |
| tree | f32ee7b1238a5be5178c342fb367d0842295aaf9 /graphics | |
| parent | c863663a01f64ec3981c680ae99e6365fc7485fa (diff) | |
| download | freebsd-ports-gnome-905304d05f3b7a9a489cd782748daf74e8d882e1.tar.gz freebsd-ports-gnome-905304d05f3b7a9a489cd782748daf74e8d882e1.tar.zst freebsd-ports-gnome-905304d05f3b7a9a489cd782748daf74e8d882e1.zip | |
Welcome CMake 2.8.12!
With contributions from Schaich Alonso <alonsoschaich@fastmail.fm>,
including stage support for devel/cmake-gui.
This update took much longer than expected due to CMake changing the
arguments to an internal macro that ended up being used by some ports:
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce60ff5
I have also started a discussion about this on CMake's development list:
http://article.gmane.org/gmane.comp.programming.tools.cmake.devel/8464
It required adjusting the affected ports, and these changes have approved by
portmgr (bdrewery).
PR: ports/182981
Approved by: portmgr (bdrewery)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/tulip/files/patch-UseTulip.cmake | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/graphics/tulip/files/patch-UseTulip.cmake b/graphics/tulip/files/patch-UseTulip.cmake new file mode 100644 index 000000000000..902d0759a462 --- /dev/null +++ b/graphics/tulip/files/patch-UseTulip.cmake @@ -0,0 +1,49 @@ +CMake 2.8.12 fix. + +http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce60ff509c4ff27fe861fc5b2080f50897a68c4 +changed the arguments of the internal macros QT4_EXTRACT_OPTIONS and +QT4_CREATE_MOC_COMMAND which the port uses directly, so we have to adapt. + +Tulip 4.x should not have this problem, as it removed its QT4_* macro wrappers. +--- UseTulip.cmake.orig 2012-06-11 10:46:14.000000000 +0300 ++++ UseTulip.cmake 2013-11-03 19:16:59.000000000 +0200 +@@ -1,5 +1,5 @@ + MACRO (TULIP_QT4_WRAP_UI outfiles ) +- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) ++ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN}) + FOREACH (it ${ui_files}) + GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) + GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) +@@ -13,7 +13,7 @@ + ENDMACRO (TULIP_QT4_WRAP_UI) + + MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE outfiles ) +- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) ++ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN}) + FOREACH (it ${ui_files}) + GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) + GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) +@@ -27,7 +27,7 @@ + ENDMACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE) + + MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE_TULIP outfiles ) +- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) ++ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN}) + FOREACH (it ${ui_files}) + GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) + GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) +@@ -42,12 +42,12 @@ + + MACRO (TULIP_QT4_WRAP_CPP outfiles ) + QT4_GET_MOC_FLAGS(moc_flags) +- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) ++ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) + FOREACH (it ${moc_files}) + GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) + GET_FILENAME_COMPONENT(it ${it} ABSOLUTE) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cpp) +- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") ++ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}") + SET(${outfiles} ${${outfiles}} ${outfile}) + ENDFOREACH(it) + ENDMACRO (TULIP_QT4_WRAP_CPP) |