Fix fltk-config for CMake build.

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

CMake/export.cmake

@@ -65,6 +65,7 @@ configure_file(
 set(prefix ${FLTK_BINARY_DIR})
 set(exec_prefix "\${prefix}")
 set(includedir "${FLTK_SOURCE_DIR}")
+set(BINARY_DIR "${FLTK_BINARY_DIR}")
 set(libdir "\${exec_prefix}/lib")
 set(srcdir ".")
 

CMake/install.cmake

@@ -78,6 +78,7 @@ install(FILES ${FLTK_BINARY_DIR}/etc/UseFLTK.cmake
 set(prefix ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix "\${prefix}")
 set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+set(BINARY_DIR)
 set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
 set(srcdir ".")
 

configure.in

@@ -1488,6 +1488,10 @@ else
     echo "        Threads: YES"
 fi
 
+dnl Set empty BINARY_DIR variable for fltk-config.in (CMake compatibility)
+BINARY_DIR=
+AC_SUBST(BINARY_DIR)
+
 dnl Write all of the files...
 AC_CONFIG_HEADER(config.h:configh.in)
 AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in)

fltk-config.in

@@ -35,6 +35,9 @@ includedir=@includedir@
 libdir=@libdir@
 srcdir=@srcdir@
 
+# BINARY_DIR - used only for CMake builds in local (binary) directory
+BINARY_DIR=@BINARY_DIR@
+
 # compiler names
 CC="@CC@"
 CXX="@CXX@"
@@ -221,6 +224,10 @@ else
     includes=
 fi
 
+if test "$BINARY_DIR" != ""; then
+    includes="-I$BINARY_DIR $includes"
+fi
+
 if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
     libs=-L$libdir
 else