blob: 3da19bb51866cc56c8841149c7a4d58438b92153 [file] [log] [blame]
From 4fd0aae36004d48736673a8c6c40bb880e2e87e4 Mon Sep 17 00:00:00 2001
From: Maciej Mrozowski <reavertm@gmail.com>
Date: Sat, 23 Jan 2010 06:51:16 +0100
Subject: [PATCH] [CMake] Fix building with glib or Qt4 tests disabled. This is workaround to be honest and needs
poppler_add_test macro fixed
---
glib/CMakeLists.txt | 8 ++++----
qt4/CMakeLists.txt | 6 ++++--
test/CMakeLists.txt | 4 ++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 6ed9523..c6b3922 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -18,9 +18,9 @@ endif (GDK_FOUND)
configure_file(poppler-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY)
-if (GTK_FOUND)
+if (GTK_FOUND AND BUILD_GTK_TESTS)
add_subdirectory(demo)
-endif (GTK_FOUND)
+endif (GTK_FOUND AND BUILD_GTK_TESTS)
set(poppler_glib_public_headers
poppler-action.h
@@ -107,11 +107,11 @@ install(FILES
DESTINATION include/poppler/glib)
-if (GDK_FOUND)
+if (GDK_FOUND AND BUILD_GTK_TESTS)
set(test_poppler_glib_SRCS
test-poppler-glib.cc
)
poppler_add_test(test-poppler-glib BUILD_GTK_TESTS ${test_poppler_glib_SRCS})
target_link_libraries(test-poppler-glib poppler-glib ${GDK2_LIBRARIES})
-endif (GDK_FOUND)
+endif (GDK_FOUND AND BUILD_GTK_TESTS)
diff --git a/qt4/CMakeLists.txt b/qt4/CMakeLists.txt
index a364abf..461ed77 100644
--- a/qt4/CMakeLists.txt
+++ b/qt4/CMakeLists.txt
@@ -1,3 +1,5 @@
add_subdirectory(src)
-add_subdirectory(tests)
-add_subdirectory(demos)
+if(BUILD_QT4_TESTS)
+ add_subdirectory(tests)
+ add_subdirectory(demos)
+endif(BUILD_QT4_TESTS)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 478cb31..2c6ec36 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,7 @@ if (ENABLE_SPLASH)
endif (ENABLE_SPLASH)
-if (GTK_FOUND)
+if (GTK_FOUND AND BUILD_GTK_TESTS)
add_definitions(${GTK2_CFLAGS})
@@ -41,7 +41,7 @@ if (GTK_FOUND)
endif (HAVE_CAIRO)
-endif (GTK_FOUND)
+endif (GTK_FOUND AND BUILD_GTK_TESTS)
set (pdf_fullrewrite_SRCS
pdf-fullrewrite.cc
--
1.6.4.4