Cmake updates (STR #645)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 11 insertions, 6 deletions

diff --git a/CMake/FLTKConfig.cmake.in b/CMake/FLTKConfig.cmake.in
index c32c41f20..b064c81dd 100644
--- a/CMake/FLTKConfig.cmake.in
+++ b/CMake/FLTKConfig.cmake.in
@@ -9,9 +9,11 @@
 SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
 
 # The FLTK include file directories.
+SET(FLUID_COMMAND "@FLTK_FLUID_COMMAND@")
 SET(FLTK_EXECUTABLE_DIRS "@FLTK_EXECUTABLE_DIRS@")
 SET(FLTK_LIBRARY_DIRS "@FLTK_LIBRARY_DIRS@")
 SET(FLTK_LIBRARIES "fltk_images;fltk;fltk_gl;fltk_forms")
+SET(FLTK_INCLUDE_DIRS "@FLTK_INCLUDE_DIRS@")
 
 # The C and C++ flags added by FLTK to the cmake-configured flags.
 SET(FLTK_REQUIRED_C_FLAGS "@FLTK_REQUIRED_C_FLAGS@")
@@ -22,11 +24,14 @@ SET(FLTK_VERSION_MAJOR "@FLTK_VERSION_MAJOR@")
 SET(FLTK_VERSION_MINOR "@FLTK_VERSION_MINOR@")
 SET(FLTK_VERSION_PATCH "@FLTK_VERSION_PATCH@")
 
-# The location of the UseFLTK.cmake file.
-SET(FLTK_USE_FILE "@FLTK_USE_FILE@")
-
-# The build settings file.
+# Is FLTK using shared libraries?
+SET(FLTK_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
 SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
 
-# Whether FLTK was built with shared libraries.
-SET(FLTK_BUILD_SHARED "@BUILD_SHARED_LIBS@")
+# The location of the UseFLTK.cmake file.
+SET(FLTK11_USE_FILE "@FLTK_USE_FILE@")
+
+# The ExodusII library dependencies.
+IF(NOT FLTK_NO_LIBRARY_DEPENDS)
+  INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
+ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)