diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-07-12 22:32:30 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-07-12 22:32:30 +0000 |
| commit | fb172ecd3cb4f6b7f654078639ad529b0d3de1ca (patch) | |
| tree | ab51ecb145f58f64e1c1e931af395cae8ab0c018 | |
| parent | 9adb18115634bf35868de920a0d0be2009beb86a (diff) | |
Fix fltk-config for CMake build.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10787 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CMake/export.cmake | 1 | ||||
| -rw-r--r-- | CMake/install.cmake | 1 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rwxr-xr-x | fltk-config.in | 7 |
4 files changed, 13 insertions, 0 deletions
diff --git a/CMake/export.cmake b/CMake/export.cmake index 4996a7753..4fe029ca4 100644 --- a/CMake/export.cmake +++ b/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 ".") diff --git a/CMake/install.cmake b/CMake/install.cmake index e97d02890..e5b398027 100644 --- a/CMake/install.cmake +++ b/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 ".") diff --git a/configure.in b/configure.in index cb6f3359b..7a225c361 100644 --- a/configure.in +++ b/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) diff --git a/fltk-config.in b/fltk-config.in index a6bee38ad..f6ab782c9 100755 --- a/fltk-config.in +++ b/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 |