| 1 |
dilfridge 11/07/31 20:21:12 |
| 2 |
|
| 3 |
Added: digikam-2.0.0-tests-1.patch |
| 4 |
Log: |
| 5 |
Fix building of tests, but restrict them anyway, see bug 366505 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.8/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/digikam/files/digikam-2.0.0-tests-1.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: digikam-2.0.0-tests-1.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN digikam-2.0.0.orig/core/tests/CMakeLists.txt digikam-2.0.0/core/tests/CMakeLists.txt |
| 18 |
--- digikam-2.0.0.orig/core/tests/CMakeLists.txt 2011-07-28 01:28:08.000000000 +0200 |
| 19 |
+++ digikam-2.0.0/core/tests/CMakeLists.txt 2011-07-31 21:47:05.000000000 +0200 |
| 20 |
@@ -223,9 +223,13 @@ |
| 21 |
|
| 22 |
#------------------------------------------------------------------------ |
| 23 |
|
| 24 |
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio |
| 25 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf |
| 26 |
- ) |
| 27 |
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio) |
| 28 |
+ |
| 29 |
+IF(PGF_FOUND) |
| 30 |
+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
| 31 |
+ELSE(PGF_FOUND) |
| 32 |
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf) |
| 33 |
+ENDIF(PGF_FOUND) |
| 34 |
|
| 35 |
# Disable libpgf warnings. |
| 36 |
SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
| 37 |
@@ -233,11 +237,20 @@ |
| 38 |
SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) |
| 39 |
KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS}) |
| 40 |
TARGET_LINK_LIBRARIES(qtpgftest ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) |
| 41 |
+IF(PGF_FOUND) |
| 42 |
+ TARGET_LINK_LIBRARIES(qtpgftest ${PGF_LIBRARIES}) |
| 43 |
+ENDIF(PGF_FOUND) |
| 44 |
|
| 45 |
SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) |
| 46 |
KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS}) |
| 47 |
TARGET_LINK_LIBRARIES(pgfscaled ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) |
| 48 |
+IF(PGF_FOUND) |
| 49 |
+ TARGET_LINK_LIBRARIES(pgfscaled ${PGF_LIBRARIES}) |
| 50 |
+ENDIF(PGF_FOUND) |
| 51 |
|
| 52 |
SET(loadpgfdata_SRCS loadpgfdata.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) |
| 53 |
KDE4_ADD_EXECUTABLE(loadpgfdata NOGUI ${loadpgfdata_SRCS}) |
| 54 |
TARGET_LINK_LIBRARIES(loadpgfdata ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) |
| 55 |
+IF(PGF_FOUND) |
| 56 |
+ TARGET_LINK_LIBRARIES(loadpgfdata ${PGF_LIBRARIES}) |
| 57 |
+ENDIF(PGF_FOUND) |
Archives