Attachment #174627 for bug #212565

View | Details | Raw Unified | Return to bug 212565
Collapse All | Expand All

Lines 3-9 Link Here

(-)devel/automoc4/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= automoc4	4	PORTNAME= automoc4
5	PORTVERSION= 0.9.88	5	PORTVERSION= 0.9.88
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= devel kde	7	CATEGORIES= devel kde
8	MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/	8	MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/
9	DIST_SUBDIR= KDE	9	DIST_SUBDIR= KDE




--- Automoc4Config.cmake.orig	2009-01-22 18:50:09 UTC
+++ Automoc4Config.cmake
@@ -49,7 +49,8 @@
 #     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 

 
 # set the automoc version number
 include(${_AUTOMOC4_CURRENT_DIR}/Automoc4Version.cmake)
@@ -114,7 +115,6 @@ macro(AUTOMOC4 _target_NAME _SRCS)
    if(_moc_files)
       set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_automoc.cpp")
       get_directory_property(_moc_incs INCLUDE_DIRECTORIES)
-      get_directory_property(_moc_defs DEFINITIONS)
       get_directory_property(_moc_cdefs COMPILE_DEFINITIONS)
 
       # configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs
@@ -176,7 +176,6 @@ macro(_ADD_AUTOMOC4_TARGET _target_NAME 
       set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp")
       set(_automoc_dotFiles "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp.files")
       get_directory_property(_moc_incs INCLUDE_DIRECTORIES)
-      get_directory_property(_moc_defs DEFINITIONS)
       get_directory_property(_moc_cdefs COMPILE_DEFINITIONS)
 
       # configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs
@@ -245,5 +244,7 @@ endmacro(_AUTOMOC4_KDE4_PRE_TARGET_HANDL
 
 
 macro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING _target)
-   add_dependencies(${_target} "${_target}_automoc")
+  if (TARGET "${_target}_automoc")
+    add_dependencies(${_target} "${_target}_automoc")
+  endif()
 endmacro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING)

Lines 1-6 Link Here

(-)devel/automoc4/files/patch-CMakeLists.txt (-3 / +12 lines)
1	--- CMakeLists.txt.orig Sun Dec 25 15:35:23 2011	1	--- CMakeLists.txt.orig 2009-01-22 18:50:09 UTC
2	+++ CMakeLists.txt Sun Dec 25 15:35:40 2011	2	+++ CMakeLists.txt
3	@@ -21,7 +21,9 @@	3	@@ -1,7 +1,6 @@
		4	+cmake_minimum_required(VERSION 2.8.9)
		5	project(Automoc4)
		6
		7	-cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
		8	-
		9	find_package(Qt4 REQUIRED)
		10
		11	if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
		12	@@ -21,7 +20,9 @@ add_executable(automoc4 kde4automoc.cpp)
4	set_target_properties(automoc4 PROPERTIES SKIP_BUILD_RPATH FALSE	13	set_target_properties(automoc4 PROPERTIES SKIP_BUILD_RPATH FALSE
5	INSTALL_RPATH_USE_LINK_PATH TRUE )	14	INSTALL_RPATH_USE_LINK_PATH TRUE )
6		15

Return to bug 212565

Lines 1-5 Link Here

(-)devel/automoc4/files/patch-Automoc4Config.cmake (-2 / +27 lines)
1	--- ./Automoc4Config.cmake.orig 2012-05-28 10:08:18.449122610 +0200	1	--- Automoc4Config.cmake.orig 2009-01-22 18:50:09 UTC
2	+++ ./Automoc4Config.cmake 2012-05-28 10:09:14.719218317 +0200	2	+++ Automoc4Config.cmake
3	@@ -49,7 +49,8 @@	3	@@ -49,7 +49,8 @@
4	# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	4	# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5		5
Lines 10-12 Link Here
10		10
11	# set the automoc version number	11	# set the automoc version number
12	include(${_AUTOMOC4_CURRENT_DIR}/Automoc4Version.cmake)	12	include(${_AUTOMOC4_CURRENT_DIR}/Automoc4Version.cmake)
		13	@@ -114,7 +115,6 @@ macro(AUTOMOC4 _target_NAME _SRCS)
		14	if(_moc_files)
		15	set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_automoc.cpp")
		16	get_directory_property(_moc_incs INCLUDE_DIRECTORIES)
		17	- get_directory_property(_moc_defs DEFINITIONS)
		18	get_directory_property(_moc_cdefs COMPILE_DEFINITIONS)
		19
		20	# configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs
		21	@@ -176,7 +176,6 @@ macro(_ADD_AUTOMOC4_TARGET _target_NAME
		22	set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp")
		23	set(_automoc_dotFiles "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp.files")
		24	get_directory_property(_moc_incs INCLUDE_DIRECTORIES)
		25	- get_directory_property(_moc_defs DEFINITIONS)
		26	get_directory_property(_moc_cdefs COMPILE_DEFINITIONS)
		27
		28	# configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs
		29	@@ -245,5 +244,7 @@ endmacro(_AUTOMOC4_KDE4_PRE_TARGET_HANDL
		30
		31
		32	macro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING _target)
		33	- add_dependencies(${_target} "${_target}_automoc")
		34	+ if (TARGET "${_target}_automoc")
		35	+ add_dependencies(${_target} "${_target}_automoc")
		36	+ endif()
		37	endmacro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING)