Make GUI build dependent on availability of QT4.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e6d2ad01cfc201af522e44102720bfbccad719d..bd108fd9d8eae21a1dbb9725feb7ca533078ddaf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ set (CMAKE_USE_PYTHON_VERSION 2.6)
 
 find_package (PythonInterp REQUIRED)
 find_package (OpenGL REQUIRED)
+find_package (Qt4)
 
 if (NOT WIN32)
     # Always use the bundled zlib and libpng sources on Windows to make it easy
@@ -238,4 +239,6 @@ if (GLUT_INCLUDE_DIR)
     )
 endif (GLUT_INCLUDE_DIR)
 
-add_subdirectory(gui)
+if (QT4_FOUND)
+    add_subdirectory(gui)
+endif (QT4_FOUND)

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index d7aa136bcab6c3a90d5797985538e2077671c571..466847c10ba9e2dfe576cd955c9f19e305e18db2 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 2.8)
-
-find_package(Qt4 REQUIRED)
-
 set(qapitrace_SRCS
    apitracemodel.cpp
    loaderthread.cpp
@@ -18,28 +14,6 @@ QT4_WRAP_UI(qapitrace_UIS_H ${qapitrace_UIS})
 
 #add_app_icon(qapitrace_SRCS ../icons/hi*-qapitrace.png)
 
-if (ZLIB_FOUND)
-    include_directories (${ZLIB_INCLUDE_DIRS})
-    link_libraries (${ZLIB_LIBRARIES})
-else (ZLIB_FOUND)
-    add_library (zlib STATIC
-        ../zlib/adler32.c
-        ../zlib/compress.c
-        ../zlib/crc32.c
-        ../zlib/gzio.c
-        ../zlib/uncompr.c
-        ../zlib/deflate.c
-        ../zlib/trees.c
-        ../zlib/zutil.c
-        ../zlib/inflate.c
-        ../zlib/infback.c
-        ../zlib/inftrees.c
-        ../zlib/inffast.c
-    )
-    include_directories (zlib)
-    link_libraries (zlib)
-endif (ZLIB_FOUND)
-
 include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_executable(qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})