Attachment #367182 for bug #457830




    macro(fc_wrap_cpp outfiles )
        # get include dirs
        QT4_GET_MOC_FLAGS(moc_flags)
        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)
            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
            set(${outfiles} ${${outfiles}} ${outfile})
            add_file_dependencies(${it} ${outfile})
        endforeach(it)




#endmacro(qt4_wrap_ui)


# This is a special version of the built in macro qt4_add_resources that generates .cpp files
#
#macro(fc_add_resources outfiles )
#    #QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
#	set(ARGN )
#    foreach (it ${rcc_files})
#      get_filename_component(outfilename ${it} NAME_WE)
#      get_filename_component(infile ${it} ABSOLUTE)
#      get_filename_component(rc_path ${infile} PATH)
#      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
#      #  parse file for dependencies 
#      #  all files are absolute paths or relative to the location of the qrc file
#      file(READ "${infile}" _RC_FILE_CONTENTS)
#      string(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
#      set(_RC_DEPENDS)
#      foreach(_RC_FILE ${_RC_FILES})
#        string(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
#        string(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
#        if(NOT _ABS_PATH_INDICATOR)
#          set(_RC_FILE "${rc_path}/${_RC_FILE}")
#        endif(NOT _ABS_PATH_INDICATOR)
#        set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
#      endforeach(_RC_FILE)
#      add_custom_command(OUTPUT ${outfile}
#        COMMAND ${QT_RCC_EXECUTABLE}
#        ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
#        MAIN_DEPENDENCY ${infile}
#        DEPENDS ${_RC_DEPENDS})
#      set(${outfiles} ${${outfiles}} ${outfile})
#    endforeach (it)
#endmacro(fc_add_resources)

MACRO (fc_add_resources outfiles )
  QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})

  FOREACH (it ${rcc_files})
    GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
    GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
    #  parse file for dependencies 
    #  all files are absolute paths or relative to the location of the qrc file
    FILE(READ "${infile}" _RC_FILE_CONTENTS)
    STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
    SET(_RC_DEPENDS)
    FOREACH(_RC_FILE ${_RC_FILES})
      STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
      STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
      IF(NOT _ABS_PATH_INDICATOR)
        SET(_RC_FILE "${rc_path}/${_RC_FILE}")
      ENDIF(NOT _ABS_PATH_INDICATOR)
      SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
    ENDFOREACH(_RC_FILE)
    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
      COMMAND ${QT_RCC_EXECUTABLE}
      ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
      MAIN_DEPENDENCY ${infile}
      DEPENDS ${_RC_DEPENDS})
    SET(${outfiles} ${${outfiles}} ${outfile})
  ENDFOREACH (it)

ENDMACRO (fc_add_resources)

MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar)
  IF(MSVC)
    GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE)

Lines 608-614 SOURCE_GROUP("Widget\\iisTaskPanel\\Mocs" FILES ${iis_MOC_SRCS}) Link Here

(-)a/src/Gui/CMakeLists.txt (-1 / +1 lines)
608	#SET(Resource_RCS	608	#SET(Resource_RCS
609	# Icons/resource.qrc	609	# Icons/resource.qrc
610	# Language/translation.qrc)	610	# Language/translation.qrc)
611	#fc_add_resources(Resource_SRCS ${Resource_RCS})	611	#qt4_add_resources(Resource_SRCS ${Resource_RCS})
612	#SET(Resource_SRCS	612	#SET(Resource_SRCS
613	# ${Resource_SRCS}	613	# ${Resource_SRCS}
614	# Icons/resource.qrc	614	# Icons/resource.qrc

Lines 20-26 Link Here

(-)a/src/Mod/Image/Gui/AppImageGui.cpp (-1 lines)
20	#include <Gui/Language/Translator.h>	20	#include <Gui/Language/Translator.h>
21	#include "Workbench.h"	21	#include "Workbench.h"
22	#include "ViewProviderImagePlane.h"	22	#include "ViewProviderImagePlane.h"
23	#include "qrc_Image.cpp"
24		23
25	// use a different name to CreateCommand()	24	// use a different name to CreateCommand()
26	void CreateImageCommands(void);	25	void CreateImageCommands(void);

Lines 30-37 SET(ImageGui_RES_SRCS Link Here

(-)a/src/Mod/Image/Gui/CMakeLists.txt (-3 / +2 lines)
30	Resources/Image.qrc	30	Resources/Image.qrc
31	)	31	)
32		32
33	fc_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})	33	qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
34	#QT4_ADD_RESOURCES(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
35		34
36	set(ImageGui_UIC_SRCS	35	set(ImageGui_UIC_SRCS
37	ImageOrientationDialog.ui	36	ImageOrientationDialog.ui
Lines 40-46 qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS}) Link Here
40		39
41	SET(ImageGui_SRCS	40	SET(ImageGui_SRCS
42	# ${ImageGui_MOC_SRCS}	41	# ${ImageGui_MOC_SRCS}
43	# ${ImageGui_QRC_SRCS}	42	${ImageGui_QRC_SRCS}
44	AppImageGui.cpp	43	AppImageGui.cpp
45	AppImageGuiPy.cpp	44	AppImageGuiPy.cpp
46	Command.cpp	45	Command.cpp

Lines 50-56 Link Here

(-)a/src/Mod/Mesh/Gui/AppMeshGui.cpp (-1 lines)
50	#include "ViewProviderDefects.h"	50	#include "ViewProviderDefects.h"
51	#include "ViewProviderPython.h"	51	#include "ViewProviderPython.h"
52	#include "Workbench.h"	52	#include "Workbench.h"
53	#include "qrc_Mesh.cpp"
54		53
55		54
56	// use a different name to CreateCommand()	55	// use a different name to CreateCommand()

Lines 75-83 SET(Inventor_SRCS Link Here

(-)a/src/Mod/Mesh/Gui/CMakeLists.txt (-2 / +2 lines)
75	)	75	)
76	SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS})	76	SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS})
77		77
78	fc_add_resources(resource_SRCS Resources/Mesh.qrc)	78	qt4_add_resources(resource_SRCS Resources/Mesh.qrc)
79	SET(resource_SRCS	79	SET(resource_SRCS
80	# ${resource_SRCS}	80	${resource_SRCS}
81	Resources/Mesh.qrc	81	Resources/Mesh.qrc
82	)	82	)
83	SOURCE_GROUP("resource" FILES ${resource_SRCS})	83	SOURCE_GROUP("resource" FILES ${resource_SRCS})

Lines 57-63 Link Here

(-)a/src/Mod/Part/Gui/AppPartGui.cpp (-1 lines)
57	#include "Workbench.h"	57	#include "Workbench.h"
58		58
59	#include <Gui/Language/Translator.h>	59	#include <Gui/Language/Translator.h>
60	#include "qrc_Part.cpp"
61		60
62	#include "Resources/icons/PartFeature.xpm"	61	#include "Resources/icons/PartFeature.xpm"
63	#include "Resources/icons/PartFeatureImport.xpm"	62	#include "Resources/icons/PartFeatureImport.xpm"

Lines 50-56 set(PartGui_MOC_HDRS Link Here

(-)a/src/Mod/Part/Gui/CMakeLists.txt (-2 / +2 lines)
50	fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS})	50	fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS})
51	SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS})	51	SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS})
52		52
53	fc_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)	53	qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
54		54
55	set(PartGui_UIC_SRCS	55	set(PartGui_UIC_SRCS
56	CrossSections.ui	56	CrossSections.ui
Lines 77-83 set(PartGui_UIC_SRCS Link Here
77	qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS})	77	qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS})
78		78
79	SET(PartGui_SRCS	79	SET(PartGui_SRCS
80	# ${PartGui_QRC_SRCS}	80	${PartGui_QRC_SRCS}
81	${PartGui_UIC_HDRS}	81	${PartGui_UIC_HDRS}
82	AppPartGui.cpp	82	AppPartGui.cpp
83	Command.cpp	83	Command.cpp

Lines 33-39 Link Here

(-)a/src/Mod/Points/Gui/AppPointsGui.cpp (-1 lines)
33		33
34	#include "ViewProvider.h"	34	#include "ViewProvider.h"
35	#include "Workbench.h"	35	#include "Workbench.h"
36	#include "qrc_Points.cpp"
37		36
38	// use a different name to CreateCommand()	37	// use a different name to CreateCommand()
39	void CreatePointsCommands(void);	38	void CreatePointsCommands(void);

Lines 32-40 SET(Dialogs_SRCS Link Here

(-)a/src/Mod/Points/Gui/CMakeLists.txt (-2 / +2 lines)
32	)	32	)
33	SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})	33	SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
34		34
35	fc_add_resources(Resource_SRCS Resources/Points.qrc)	35	qt4_add_resources(Resource_SRCS Resources/Points.qrc)
36	SET(Resource_SRCS	36	SET(Resource_SRCS
37	# ${Resource_SRCS}	37	${Resource_SRCS}
38	Resources/Points.qrc	38	Resources/Points.qrc
39	)	39	)
40	SOURCE_GROUP("Resource" FILES ${Resource_SRCS})	40	SOURCE_GROUP("Resource" FILES ${Resource_SRCS})

Lines 32-38 Link Here

(-)a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp (-1 lines)
32	#include "DlgSettingsRayImp.h"	32	#include "DlgSettingsRayImp.h"
33	#include "ViewProvider.h"	33	#include "ViewProvider.h"
34	#include "Workbench.h"	34	#include "Workbench.h"
35	#include "qrc_Raytracing.cpp"
36		35
37		36
38	using namespace RaytracingGui;	37	using namespace RaytracingGui;

Lines 43-50 set(RaytracingGui_MOC_HDRS Link Here

(-)a/src/Mod/Raytracing/Gui/CMakeLists.txt (-1 / +2 lines)
43	fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS})	43	fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS})
44	SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS})	44	SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS})
45		45
46	fc_add_resources(Resource_SRCS Resources/Raytracing.qrc)	46	qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc)
47	SET(Resource_SRCS	47	SET(Resource_SRCS
		48	${Resource_SRCS}
48	Resources/Raytracing.qrc	49	Resources/Raytracing.qrc
49	)	50	)
50	SOURCE_GROUP("Resource" FILES ${Resource_SRCS})	51	SOURCE_GROUP("Resource" FILES ${Resource_SRCS})

Lines 28-34 Link Here

(-)a/src/Mod/Test/Gui/AppTestGui.cpp (-1 lines)
28		28
29	#include "UnitTestPy.h"	29	#include "UnitTestPy.h"
30	#include "UnitTestImp.h"	30	#include "UnitTestImp.h"
31	#include "qrc_Test.cpp"
32		31
33	#include <Gui/Language/Translator.h>	32	#include <Gui/Language/Translator.h>
34	#include <Base/Console.h>	33	#include <Base/Console.h>

Lines 30-38 SET(Dialogs_SRCS Link Here

(-)a/src/Mod/Test/Gui/CMakeLists.txt (-2 / +2 lines)
30	)	30	)
31	SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})	31	SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
32		32
33	fc_add_resources(Resource_SRCS Resources/Test.qrc)	33	qt4_add_resources(Resource_SRCS Resources/Test.qrc)
34	SET(Resource_SRCS	34	SET(Resource_SRCS
35	# ${Resource_SRCS}	35	${Resource_SRCS}
36	Resources/Test.qrc	36	Resources/Test.qrc
37	)	37	)
38	SOURCE_GROUP("Resource" FILES ${Resource_SRCS})	38	SOURCE_GROUP("Resource" FILES ${Resource_SRCS})

Return to bug 457830

Lines 270-283 MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X) Link Here

(-)a/CMakeLists.txt (-2 / +2 lines)
270	macro(fc_wrap_cpp outfiles )	270	macro(fc_wrap_cpp outfiles )
271	# get include dirs	271	# get include dirs
272	QT4_GET_MOC_FLAGS(moc_flags)	272	QT4_GET_MOC_FLAGS(moc_flags)
273	QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})	273	QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
274	# fixes bug 0000585: bug with boost 1.48	274	# fixes bug 0000585: bug with boost 1.48
275	SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)	275	SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
276		276
277	foreach(it ${moc_files})	277	foreach(it ${moc_files})
278	get_filename_component(it ${it} ABSOLUTE)	278	get_filename_component(it ${it} ABSOLUTE)
279	QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)	279	QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
280	QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")	280	QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
281	set(${outfiles} ${${outfiles}} ${outfile})	281	set(${outfiles} ${${outfiles}} ${outfile})
282	add_file_dependencies(${it} ${outfile})	282	add_file_dependencies(${it} ${outfile})
283	endforeach(it)	283	endforeach(it)

Lines 168-236 endmacro(generate_from_py) Link Here

(-)a/cMake/FreeCadMacros.cmake (-63 lines)
168	#endmacro(qt4_wrap_ui)	168	#endmacro(qt4_wrap_ui)
169		169
170		170
171	# This is a special version of the built in macro qt4_add_resources that generates .cpp files
172	#
173	#macro(fc_add_resources outfiles )
174	# #QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
175	# set(ARGN )
176	# foreach (it ${rcc_files})
177	# get_filename_component(outfilename ${it} NAME_WE)
178	# get_filename_component(infile ${it} ABSOLUTE)
179	# get_filename_component(rc_path ${infile} PATH)
180	# set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
181	# # parse file for dependencies
182	# # all files are absolute paths or relative to the location of the qrc file
183	# file(READ "${infile}" _RC_FILE_CONTENTS)
184	# string(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
185	# set(_RC_DEPENDS)
186	# foreach(_RC_FILE ${_RC_FILES})
187	# string(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
188	# string(REGEX MATCH "^/\|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
189	# if(NOT _ABS_PATH_INDICATOR)
190	# set(_RC_FILE "${rc_path}/${_RC_FILE}")
191	# endif(NOT _ABS_PATH_INDICATOR)
192	# set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
193	# endforeach(_RC_FILE)
194	# add_custom_command(OUTPUT ${outfile}
195	# COMMAND ${QT_RCC_EXECUTABLE}
196	# ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
197	# MAIN_DEPENDENCY ${infile}
198	# DEPENDS ${_RC_DEPENDS})
199	# set(${outfiles} ${${outfiles}} ${outfile})
200	# endforeach (it)
201	#endmacro(fc_add_resources)
202
203	MACRO (fc_add_resources outfiles )
204	QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
205
206	FOREACH (it ${rcc_files})
207	GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
208	GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
209	GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
210	SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
211	# parse file for dependencies
212	# all files are absolute paths or relative to the location of the qrc file
213	FILE(READ "${infile}" _RC_FILE_CONTENTS)
214	STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
215	SET(_RC_DEPENDS)
216	FOREACH(_RC_FILE ${_RC_FILES})
217	STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
218	STRING(REGEX MATCH "^/\|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
219	IF(NOT _ABS_PATH_INDICATOR)
220	SET(_RC_FILE "${rc_path}/${_RC_FILE}")
221	ENDIF(NOT _ABS_PATH_INDICATOR)
222	SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
223	ENDFOREACH(_RC_FILE)
224	ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
225	COMMAND ${QT_RCC_EXECUTABLE}
226	ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
227	MAIN_DEPENDENCY ${infile}
228	DEPENDS ${_RC_DEPENDS})
229	SET(${outfiles} ${${outfiles}} ${outfile})
230	ENDFOREACH (it)
231
232	ENDMACRO (fc_add_resources)
233
234	MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar)	171	MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar)
235	IF(MSVC)	172	IF(MSVC)
236	GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE)	173	GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE)