From: | "Marcus Hanwell (cryos)" <cryos@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in kde-base/kalzium/files: kalzium-4.2.1-include-order.patch |
Date: | Thu, 12 Mar 2009 02:52:39 |
Message-Id: | E1Lhb2E-0005wV-9u@stork.gentoo.org |
1 | cryos 09/03/12 02:52:38 |
2 | |
3 | Added: kalzium-4.2.1-include-order.patch |
4 | Log: |
5 | Fixed build time bug 261392. |
6 | (Portage version: 2.2_rc24/cvs/Linux x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.1 kde-base/kalzium/files/kalzium-4.2.1-include-order.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kalzium/files/kalzium-4.2.1-include-order.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kalzium/files/kalzium-4.2.1-include-order.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: kalzium-4.2.1-include-order.patch |
15 | =================================================================== |
16 | --- kalzium-4.2.1/work/kalzium-4.2.1/kalzium/libavogadro-kalzium/src/CMakeLists.txt 2009-02-26 09:17:16.000000000 -0500 |
17 | +++ /root/CMakeLists.txt 2009-03-11 18:19:48.000000000 -0400 |
18 | @@ -15,10 +15,12 @@ |
19 | ${CMAKE_CURRENT_BINARY_DIR}/config.h |
20 | ) |
21 | |
22 | -include(${QT_USE_FILE}) |
23 | +# Ensure the Avogadro include directory is always first |
24 | +get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES) |
25 | +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES |
26 | + "${libavogadro-kalzium_SOURCE_DIR}/include;${tmp_include_dirs}") |
27 | |
28 | include_directories( |
29 | - ${libavogadro-kalzium_SOURCE_DIR}/include |
30 | ${CMAKE_SOURCE_DIR} |
31 | ${CMAKE_CURRENT_BINARY_DIR} |
32 | ${CMAKE_CURRENT_BINARY_DIR}/.. |
33 | @@ -26,6 +28,8 @@ |
34 | ${EIGEN_INCLUDE_DIR} |
35 | ) |
36 | |
37 | +include(${QT_USE_FILE}) |
38 | + |
39 | # Need to build with visibility enabled if KDE is |
40 | if(__KDE_HAVE_GCC_VISIBILITY) |
41 | add_definitions(-DHAVE_GCC_VISIBILITY) |