blob: 5e127f64f61ede1ca42c8d23bbd815920ab87b68 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- jreenMacros.cmake 2013-01-06 17:49:31.000000000 +0200
+++ jreenMacros.cmake_ 2013-10-20 19:01:21.422281971 +0300
@@ -19,7 +19,7 @@
MACRO (JREEN_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})
FOREACH (it ${moc_files})
GET_FILENAME_COMPONENT(_abs_FILE ${it} ABSOLUTE)
@@ -39,7 +39,7 @@
FOREACH (_current_MOC_INC ${_match})
STRING(REGEX MATCH "moc_[^ <\"]+\\.cpp" _current_MOC "${_current_MOC_INC}")
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
- QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "")
+ QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "${moc_options}" "${moc_target}")
MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
ENDFOREACH (_current_MOC_INC)
ENDIF()
@@ -47,7 +47,7 @@
FOREACH (_current_MOC_INC ${_match2})
STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
- QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
+ QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "${moc_options}" "${moc_target}")
MACRO_ADD_FILE_DEPENDENCIES(${_header} ${_moc})
ENDFOREACH (_current_MOC_INC)
ENDIF()
@@ -57,7 +57,7 @@
STRING(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}")
IF(_match2)
QT4_MAKE_OUTPUT_FILE(${_abs_FILE} moc_ cpp outfile)
- QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}")
+ QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
SET(${outfiles} ${${outfiles}} ${outfile})
ENDIF()
ENDIF()
|