41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From eaf92b8d2f5a058fbf575d733f0924c446eb93ee Mon Sep 17 00:00:00 2001
|
|
From: Heiko Becker <heirecka@exherbo.org>
|
|
Date: Sat, 7 Nov 2015 11:40:00 +0100
|
|
Subject: [PATCH 3/5] Give each htmlhandbook target a unique name
|
|
|
|
Since the CMP0002 warnings have been turned into errors it was
|
|
impossible to build kdelibs with -DKDE4_ENABLE_HTMLHANDBOOK:BOOL=TRUE:
|
|
|
|
"CMake Error at cmake/modules/KDE4Macros.cmake:315 (add_custom_target):
|
|
add_custom_target cannot create target "htmlhandbook" because another
|
|
target with the same name already exists...."
|
|
|
|
The bug below is more about the similar error with -DKDE4_BUILD_TESTS
|
|
but since it's still open (and I commented there about the htmlhandbook
|
|
error ;-) I included it here.
|
|
|
|
BUG: 351287
|
|
REVIEW: 125983
|
|
---
|
|
cmake/modules/KDE4Macros.cmake | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
|
|
index 5b3db07..d540da7 100644
|
|
--- a/cmake/modules/KDE4Macros.cmake
|
|
+++ b/cmake/modules/KDE4Macros.cmake
|
|
@@ -317,7 +317,9 @@ macro (KDE4_CREATE_HANDBOOK _docbook)
|
|
DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet}
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
)
|
|
- add_custom_target(htmlhandbook DEPENDS ${_htmlDoc})
|
|
+ _suggest_target_name(_targ)
|
|
+ set(_targ "${_targ}-htmlhandbook")
|
|
+ add_custom_target(${_targ} ALL DEPENDS ${_htmlDoc})
|
|
endif(KDE4_ENABLE_HTMLHANDBOOK)
|
|
|
|
set(_args ${ARGN})
|
|
--
|
|
1.9.3
|
|
|