diff options
| author | ambrop7@gmail.com <Ambroz Bizjak> | 2014-04-20 11:41:02 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-04-20 16:45:00 +0200 |
| commit | 3bab2f2fc4345688257c8d0e73ad39ea7fd1830e (patch) | |
| tree | cd310eb252250e64e27c6d515df093117c1ee9b8 /pkgs/applications/graphics | |
| parent | 88e531d8dc1d6002cf4b43ebd8c19fbfccc58ae6 (diff) | |
| download | nixlib-3bab2f2fc4345688257c8d0e73ad39ea7fd1830e.tar nixlib-3bab2f2fc4345688257c8d0e73ad39ea7fd1830e.tar.gz nixlib-3bab2f2fc4345688257c8d0e73ad39ea7fd1830e.tar.bz2 nixlib-3bab2f2fc4345688257c8d0e73ad39ea7fd1830e.tar.lz nixlib-3bab2f2fc4345688257c8d0e73ad39ea7fd1830e.tar.xz nixlib-3bab2f2fc4345688257c8d0e73ad39ea7fd1830e.tar.zst nixlib-3bab2f2fc4345688257c8d0e73ad39ea7fd1830e.zip | |
FreeCAD: Fix build.
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/freecad/cmake.patch | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch index e54e16da9775..62efaf1e29dc 100644 --- a/pkgs/applications/graphics/freecad/cmake.patch +++ b/pkgs/applications/graphics/freecad/cmake.patch @@ -1,7 +1,27 @@ -diff -ru freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt ---- freecad-0.13.1830.orig/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/CMakeLists.txt 2014-02-15 10:16:00.939725500 +0100 -@@ -321,7 +321,7 @@ +diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake +--- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake 2013-02-02 18:09:17.000000000 +0100 ++++ freecad-0.13.1830/cMake/FreeCadMacros.cmake 2014-04-20 10:52:17.293599913 +0200 +@@ -201,7 +201,7 @@ + #endmacro(fc_add_resources) + + MACRO (fc_add_resources outfiles ) +- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) ++ QT4_EXTRACT_OPTIONS(rcc_files rcc_options rcc_target ${ARGN}) + + FOREACH (it ${rcc_files}) + GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) +diff -urN freecad-0.13.1830.old/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt +--- freecad-0.13.1830.old/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 ++++ freecad-0.13.1830/CMakeLists.txt 2014-04-20 10:28:41.782536753 +0200 +@@ -314,14 +314,14 @@ + macro(fc_wrap_cpp outfiles ) + # get include dirs + QT4_GET_MOC_FLAGS(moc_flags) +- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) ++ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) + # fixes bug 0000585: bug with boost 1.48 + SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + foreach(it ${moc_files}) get_filename_component(it ${it} ABSOLUTE) QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) |