added --prefix and --includedir flags to fltk-config (STR #2137)

also fixed typo in fltk-config.cmake.in (STR #2443)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7825 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
engelsman 2010-11-13 16:47:47 +00:00
parent ce6043d160
commit e729fccaf9
2 changed files with 35 additions and 3 deletions

View File

@ -4,7 +4,7 @@
#
# FLTK configuration utility.
#
# Copyright 2000-2009 by Bill Spitzak and others.
# Copyright 2000-2010 by Bill Spitzak and others.
# Original version Copyright 2000 by James Dean Palmer
# Adapted by Vincent Penne and Michael Sweet
#
@ -41,7 +41,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
exec_prefix_set=no
bindir=@PREFIX_BIN@
includedir=@CPREFIX_INCLUDE@
includedir=@PREFIX_INCLUDE@
libdir=@PREFIX_LIB@
srcdir=.
@ -123,6 +123,8 @@ Options telling what information we request:
[--ldstaticflags] return flags to link against static FLTK library
even if there are DSOs installed
[--libs] return FLTK libraries full path for dependencies
[--prefix] return FLTK install time --prefix directory
[--includedir] return FLTK install time include directory
Options to compile and link an application:
[-g] compile the program with debugging information
@ -197,6 +199,12 @@ do
--libs)
echo_libs=yes
;;
--prefix)
echo_prefix=yes
;;
--includedir)
echo_includedir=yes
;;
-g)
debug=-g
;;
@ -385,6 +393,14 @@ if test "$echo_libs" = "yes"; then
echo $USELIBS
fi
if test "$echo_prefix" = "yes"; then
echo $prefix
fi
if test "$echo_includedir" = "yes"; then
echo $includedir
fi
#
# End of "$Id: fltk-config.in 6614 2009-01-01 16:11:32Z matt $".
#

View File

@ -4,7 +4,7 @@
#
# FLTK configuration utility.
#
# Copyright 2000-2009 by Bill Spitzak and others.
# Copyright 2000-2010 by Bill Spitzak and others.
# Original version Copyright 2000 by James Dean Palmer
# Adapted by Vincent Penne and Michael Sweet
#
@ -123,6 +123,8 @@ Options telling what information we request:
[--ldstaticflags] return flags to link against static FLTK library
even if there are DSOs installed
[--libs] return FLTK libraries full path for dependencies
[--prefix] return FLTK install time --prefix directory
[--includedir] return FLTK install time include directory
Options to compile and link an application:
[-g] compile the program with debugging information
@ -197,6 +199,12 @@ do
--libs)
echo_libs=yes
;;
--prefix)
echo_prefix=yes
;;
--includedir)
echo_includedir=yes
;;
-g)
debug=-g
;;
@ -385,6 +393,14 @@ if test "$echo_libs" = "yes"; then
echo $USELIBS
fi
if test "$echo_prefix" = "yes"; then
echo $prefix
fi
if test "$echo_includedir" = "yes"; then
echo $includedir
fi
#
# End of "$Id$".
#