summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch')
-rw-r--r--sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch b/sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
deleted file mode 100644
index 615a92290805..000000000000
--- a/sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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.9.1
-