alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

FreeCAD: Fix build.

Browse source
This commit is contained in:
ambrop7@gmail.com 2014-04-20 11:41:02 +02:00 committed by Bjørn Forsman
parent 88e531d8dc
commit 3bab2f2fc4
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/graphics/freecad/cmake.patch
View file

@ -1,7 +1,27 @@
diff -ru freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake
--- freecad-0.13.1830.orig/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 --- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake 2013-02-02 18:09:17.000000000 +0100
+++ freecad-0.13.1830/CMakeLists.txt 2014-02-15 10:16:00.939725500 +0100 +++ freecad-0.13.1830/cMake/FreeCadMacros.cmake 2014-04-20 10:52:17.293599913 +0200
@@ -321,7 +321,7 @@ @@ -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}) foreach(it ${moc_files})
get_filename_component(it ${it} ABSOLUTE) get_filename_component(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)