Use QT includes and definitions in the gui subdirectory only.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d189597779d0c6ee2a035d0918e4d50741af94ed..d90f029cfb92c4b90b6f75e4ba36504dea9476ae 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,5 @@ if (GLUT_INCLUDE_DIR)
 endif (GLUT_INCLUDE_DIR)
 
 if (QT4_FOUND AND QJSON_FOUND)
-    # Include the cmake file needed to use qt4
-    include( ${QT_USE_FILE} )
     add_subdirectory(gui)
 endif (QT4_FOUND AND QJSON_FOUND)

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 632a441447a192bfa670f46e8ee8f80d4826cabb..ea35867d934ec418da7b2469ca895ed6502b895f 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Include the cmake file needed to use qt4
+include( ${QT_USE_FILE} )
+
 set(qapitrace_SRCS
    apitrace.cpp
    apicalldelegate.cpp