Re: [Debian-med-packaging] Bug#720681: Help with cmake needed (Was: Bug#720681: (Further) help with C++ needed)
Hello,
it seems the attached patch solves the problem (Building at 95% way
beyond where it failed before).
Actually, it is commit 1e76c9 in the ball git repro
https://bitbucket.org/ball/ball
Cheers,
Gert
>From 1e76c9cb1920e9176b725269985c7eb43126d188 Mon Sep 17 00:00:00 2001
From: Luis de la Garza <delagarza@informatik.uni-tuebingen.de>
Date: Fri, 22 Nov 2013 15:18:55 +0100
Subject: [PATCH] QT4_EXTRACT_OPTIONS CMake macro changed in CMake 2.8.12;
fixed BALLMacros.cmake
---
cmake/BALLMacros.cmake | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/cmake/BALLMacros.cmake b/cmake/BALLMacros.cmake
index f81ab89..0ac1b87 100644
--- a/cmake/BALLMacros.cmake
+++ b/cmake/BALLMacros.cmake
@@ -6,16 +6,22 @@
### minor modifications (marked with ## BALL ###)
###
MACRO(QT4_WRAP_UI_BALL outfiles )
- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-
- ### BALL ###
+ # since 2.8.12 qt4_extract_options has an additional argument
+ # copied fix from OpenMS
+ IF(${CMAKE_VERSION} VERSION_LESS "2.8.12")
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+ ELSE()
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
+ ENDIF()
+
+ ### BALL ###
# create output directory (will not exist for out-of-source builds)
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/BALL/VIEW/UIC/)
FOREACH (it ${ui_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
- ### BALL ###
+ ### BALL ###
SET(outfile ${PROJECT_BINARY_DIR}/include/BALL/VIEW/UIC/ui_${outfile}.h)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_UIC_EXECUTABLE}
--
1.8.5.1
Reply to: