Merge pull request firebreath#95 from GordonSmith/FIREBREATH-221

FIREBREATH-221 CMake must be run twice on Linux
dougma · Apr 23, 2013 · b73d799 · b73d799
2 parents 45ca8ea + 798be2e
commit b73d799
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cmake/X11.cmake b/cmake/X11.cmake
@@ -35,10 +35,10 @@ MACRO(find_firebreath_x11_deps)
     if (NOT FB_GUI_DISABLED)
         if (NOT GTK_INCLUDE_DIRS)
             pkg_check_modules(GTK REQUIRED gtk+-2.0)
-            set (GTK_INCLUDE_DIRS ${GTK_INCLUDE_DIRS} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
-            set (GTK_LIBRARIES ${GTK_LIBRARIES} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
-            set (GTK_LIBRARY_DIRS ${GTK_LIBRARY_DIRS} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
-            set (GTK_LDFLAGS ${GTK_LDFLAGS} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
+            set (GTK_INCLUDE_DIRS ${GTK_INCLUDE_DIRS} PARENT_SCOPE)
+            set (GTK_LIBRARIES ${GTK_LIBRARIES} PARENT_SCOPE)
+            set (GTK_LIBRARY_DIRS ${GTK_LIBRARY_DIRS} PARENT_SCOPE)
+            set (GTK_LDFLAGS ${GTK_LDFLAGS} PARENT_SCOPE)
         endif()
         set (FB_INCLUDE_DIRS ${FB_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS})
         set (PLUGIN_INTERNAL_DEPS ${PLUGIN_INTERNAL_DEPS} ${GTK_LIBRARIES} PARENT_SCOPE)